static const char *appname = "uci";
static enum {
CLI_FLAG_MERGE = (1 << 0),
+ CLI_FLAG_QUIET = (1 << 1)
} flags;
-static FILE *input = stdin;
+static FILE *input;
static struct uci_context *ctx;
enum {
"Options:\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)\n"
+ "\t-n name unnamed sections on export (default)\n"
+ "\t-N don't name unnamed sections\n"
+ "\t-q quiet mode (don't print error messages)\n"
+ "\t-s force strict mode (stop on parser errors, default)\n"
"\t-S disable strict mode\n"
"\n",
argv[0]
exit(255);
}
+static void cli_perror(void)
+{
+ if (flags & CLI_FLAG_QUIET)
+ return;
+
+ uci_perror(ctx, appname);
+}
+
static void uci_show_section(struct uci_section *p)
{
struct uci_element *e;
struct uci_package *p = NULL;
if (uci_load(ctx, package, &p) != UCI_OK) {
- uci_perror(ctx, appname);
+ cli_perror();
return 1;
}
+ if (!p)
+ return 0;
switch(cmd) {
case CMD_COMMIT:
- if (uci_commit(ctx, &p) != UCI_OK)
- uci_perror(ctx, appname);
+ if (uci_commit(ctx, &p, false) != UCI_OK)
+ cli_perror();
break;
case CMD_EXPORT:
uci_export(ctx, stdout, p, true);
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) {
+ cli_perror();
+ return 1;
+ }
+
return 0;
}
return package_cmd(cmd, argv[1]);
if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) {
- uci_perror(ctx, appname);
+ cli_perror();
return 1;
}
return 1;
if (uci_load(ctx, package, &p) != UCI_OK) {
- uci_perror(ctx, appname);
+ cli_perror();
return 1;
}
+ if (!p)
+ return 0;
switch(cmd) {
case CMD_GET:
ret = uci_save(ctx, p);
if (ret != UCI_OK) {
- uci_perror(ctx, appname);
+ cli_perror();
return 1;
}
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:sSnNq")) != -1) {
switch(c) {
case 'f':
input = fopen(optarg, "r");
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;
+ case 'q':
+ flags |= CLI_FLAG_QUIET;
+ break;
default:
uci_usage(argc, argv);
break;