#include "uci.h"
static const char *appname = "uci";
+static enum {
+ CLI_FLAG_MERGE = (1 << 0),
+} flags;
+static FILE *input;
static struct uci_context *ctx;
enum {
/* section cmds */
- CMD_GET = 1,
- CMD_SET = 2,
- CMD_DEL = 3,
+ CMD_GET,
+ CMD_SET,
+ CMD_DEL,
+ CMD_RENAME,
/* package cmds */
- CMD_SHOW = 4,
- CMD_EXPORT = 5,
- CMD_COMMIT = 6,
+ CMD_SHOW,
+ CMD_IMPORT,
+ CMD_EXPORT,
+ CMD_COMMIT,
};
static void uci_usage(int argc, char **argv)
fprintf(stderr,
"Usage: %s [<options>] <command> [<arguments>]\n\n"
"Commands:\n"
- "\texport [<config>]\n"
- "\tshow [<config>[.<section>[.<option>]]]\n"
- "\tget <config>.<section>[.<option>]\n"
- "\tset <config>.<section>[.<option>]=<value>\n"
+ "\texport [<config>]\n"
+ "\timport [<config>]\n"
+ "\tshow [<config>[.<section>[.<option>]]]\n"
+ "\tget <config>.<section>[.<option>]\n"
+ "\tset <config>.<section>[.<option>]=<value>\n"
+ "\trename <config>.<section>[.<option>]=<name>\n"
"\n"
"Options:\n"
- "\t-s force strict mode (stop on parser errors)\n"
- "\t-S disable strict mode\n"
+ "\t-f <file> use <file> as input instead of stdin\n"
+ "\t-m when importing, merge data into an existing package\n"
+ "\t-s force strict mode (stop on parser errors, default)\n"
+ "\t-S disable strict mode\n"
+ "\t-n name unnamed sections on export (default)\n"
+ "\t-N don't name unnamed sections\n"
"\n",
argv[0]
);
}
switch(cmd) {
case CMD_COMMIT:
- if (uci_commit(ctx, &p) != UCI_OK)
+ if (uci_commit(ctx, &p, false) != UCI_OK)
uci_perror(ctx, appname);
break;
case CMD_EXPORT:
return 0;
}
+static int uci_do_import(int argc, char **argv)
+{
+ struct uci_package *package = NULL;
+ char *name = NULL;
+ int ret = UCI_OK;
+
+ if (argc > 2)
+ return 255;
+
+ if (argc == 2)
+ name = argv[1];
+ else if (flags & CLI_FLAG_MERGE)
+ /* need a package to merge */
+ return 255;
+
+ if (flags & CLI_FLAG_MERGE) {
+ if (uci_load(ctx, name, &package) != UCI_OK)
+ package = NULL;
+ }
+ ret = uci_import(ctx, input, name, &package, (name != NULL));
+ if (ret == UCI_OK) {
+ if (flags & CLI_FLAG_MERGE) {
+ ret = uci_save(ctx, package);
+ } else {
+ struct uci_element *e;
+ /* loop through all config sections and overwrite existing data */
+ uci_foreach_element(&ctx->root, e) {
+ struct uci_package *p = uci_to_package(e);
+ ret = uci_commit(ctx, &p, true);
+ }
+ }
+ }
+
+ if (ret != UCI_OK) {
+ uci_perror(ctx, appname);
+ return 1;
+ }
+
+ return 0;
+}
+
static int uci_do_package_cmd(int cmd, int argc, char **argv)
{
char **configs = NULL;
static int uci_do_section_cmd(int cmd, int argc, char **argv)
{
+ struct uci_package *p = NULL;
+ struct uci_element *e = NULL;
char *package = NULL;
char *section = NULL;
char *option = NULL;
char *value = NULL;
- struct uci_package *p = NULL;
- struct uci_element *e = NULL;
+ char **ptr = NULL;
+ int ret = UCI_OK;
if (argc != 2)
return 255;
- if (uci_parse_tuple(ctx, argv[1], &package, §ion, &option, (cmd == CMD_SET ? &value : NULL)) != UCI_OK)
+ switch(cmd) {
+ case CMD_SET:
+ case CMD_RENAME:
+ ptr = &value;
+ break;
+ default:
+ break;
+ }
+ if (uci_parse_tuple(ctx, argv[1], &package, §ion, &option, ptr) != UCI_OK)
return 1;
if (uci_load(ctx, package, &p) != UCI_OK) {
/* throw the value to stdout */
printf("%s\n", value);
break;
+ case CMD_RENAME:
+ ret = uci_rename(ctx, p, section, option, value);
+ break;
case CMD_SET:
- if (uci_set(ctx, p, section, option, value) != UCI_OK) {
- uci_perror(ctx, appname);
- return 1;
- }
+ ret = uci_set(ctx, p, section, option, value);
break;
case CMD_DEL:
- if (uci_del(ctx, p, section, option) != UCI_OK) {
- uci_perror(ctx, appname);
- return 1;
- }
+ ret = uci_delete(ctx, p, section, option);
break;
}
return 0;
/* save changes, but don't commit them yet */
- if (uci_save(ctx, p) != UCI_OK) {
+ if (ret == UCI_OK)
+ ret = uci_save(ctx, p);
+
+ if (ret != UCI_OK) {
uci_perror(ctx, appname);
return 1;
}
cmd = CMD_GET;
else if (!strcasecmp(argv[0], "set"))
cmd = CMD_SET;
+ else if (!strcasecmp(argv[0], "ren") ||
+ !strcasecmp(argv[0], "rename"))
+ cmd = CMD_RENAME;
else if (!strcasecmp(argv[0], "del"))
cmd = CMD_DEL;
+ else if (!strcasecmp(argv[0], "import"))
+ cmd = CMD_IMPORT;
+ else
+ cmd = -1;
switch(cmd) {
case CMD_GET:
case CMD_SET:
case CMD_DEL:
+ case CMD_RENAME:
return uci_do_section_cmd(cmd, argc, argv);
case CMD_SHOW:
case CMD_EXPORT:
case CMD_COMMIT:
return uci_do_package_cmd(cmd, argc, argv);
+ case CMD_IMPORT:
+ return uci_do_import(argc, argv);
default:
return 255;
}
int ret;
int c;
+ input = stdin;
ctx = uci_alloc_context();
if (!ctx) {
fprintf(stderr, "Out of memory\n");
return 1;
}
- while((c = getopt(argc, argv, "sS")) != -1) {
+ while((c = getopt(argc, argv, "mf:sSnN")) != -1) {
switch(c) {
+ case 'f':
+ input = fopen(optarg, "r");
+ if (!input) {
+ perror("uci");
+ return 1;
+ }
+ break;
+ case 'm':
+ flags |= CLI_FLAG_MERGE;
+ break;
case 's':
ctx->flags |= UCI_FLAG_STRICT;
break;
ctx->flags &= ~UCI_FLAG_STRICT;
ctx->flags |= UCI_FLAG_PERROR;
break;
+ case 'n':
+ ctx->flags |= UCI_FLAG_EXPORT_NAME;
+ break;
+ case 'N':
+ ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
+ break;
default:
uci_usage(argc, argv);
break;
if (argc < 2)
uci_usage(argc, argv);
ret = uci_cmd(argc - 1, argv + 1);
+ if (input != stdin)
+ fclose(input);
if (ret == 255)
uci_usage(argc, argv);
projects / project / uci.git / blobdiff