X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=f8b45dba091f088f84e22dc98503fe9e6e1fd7e3;hp=a5b77a8fa1003ee75f19520cc83311730d8935b1;hb=25fd142c8dbed12354f544acbe08b3bf71075e53;hpb=e4516d01a7d2b0a5a8def7b5791c7d4032138287 diff --git a/cli.c b/cli.c index a5b77a8..f8b45db 100644 --- a/cli.c +++ b/cli.c @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include #include "uci.h" @@ -85,9 +87,10 @@ static char * uci_lookup_section_ref(struct uci_section *s) { struct uci_type_list *ti = type_list; + char *ret; int maxlen; - if (!s->anonymous || !(flags & CLI_FLAG_SHOW_EXT)) + if (!(flags & CLI_FLAG_SHOW_EXT)) return s->e.name; /* look up in section type list */ @@ -106,19 +109,25 @@ uci_lookup_section_ref(struct uci_section *s) ti->name = s->type; } - maxlen = strlen(s->type) + 1 + 2 + 10; - if (!typestr) { - typestr = malloc(maxlen); + if (s->anonymous) { + maxlen = strlen(s->type) + 1 + 2 + 10; + if (!typestr) { + typestr = malloc(maxlen); + } else { + typestr = realloc(typestr, maxlen); + } + + if (typestr) + sprintf(typestr, "@%s[%d]", ti->name, ti->idx); + + ret = typestr; } else { - typestr = realloc(typestr, maxlen); + ret = s->e.name; } - if (typestr) - sprintf(typestr, "@%s[%d]", ti->name, ti->idx); - ti->idx++; - return typestr; + return ret; } static void uci_usage(void) @@ -168,18 +177,53 @@ static void cli_perror(void) uci_perror(ctx, appname); } -static void uci_show_value(struct uci_option *o) +static void cli_error(const char *fmt, ...) +{ + va_list ap; + + if (flags & CLI_FLAG_QUIET) + return; + + va_start(ap, fmt); + vfprintf(stderr, fmt, ap); + va_end(ap); +} + +static void uci_print_value(FILE *f, const char *v) +{ + fprintf(f, "'"); + while (*v) { + if (*v != '\'') + fputc(*v, f); + else + fprintf(f, "'\\''"); + v++; + } + fprintf(f, "'"); +} + +static void uci_show_value(struct uci_option *o, bool quote) { struct uci_element *e; bool sep = false; + char *space; switch(o->type) { case UCI_TYPE_STRING: - printf("%s\n", o->v.string); + if (quote) + uci_print_value(stdout, o->v.string); + else + printf("%s", o->v.string); + printf("\n"); break; case UCI_TYPE_LIST: uci_foreach_element(&o->v.list, e) { - printf("%s%s", (sep ? delimiter : ""), e->name); + printf("%s", (sep ? delimiter : "")); + space = strpbrk(e->name, " \t\r\n"); + if (!space && !quote) + printf("%s", e->name); + else + uci_print_value(stdout, e->name); sep = true; } printf("\n"); @@ -190,13 +234,13 @@ static void uci_show_value(struct uci_option *o) } } -static void uci_show_option(struct uci_option *o) +static void uci_show_option(struct uci_option *o, bool quote) { printf("%s.%s.%s=", o->section->package->e.name, (cur_section_ref ? cur_section_ref : o->section->e.name), o->e.name); - uci_show_value(o); + uci_show_value(o, quote); } static void uci_show_section(struct uci_section *s) @@ -209,7 +253,7 @@ static void uci_show_section(struct uci_section *s) sname = (cur_section_ref ? cur_section_ref : s->e.name); printf("%s.%s=%s\n", cname, sname, s->type); uci_foreach_element(&s->options, e) { - uci_show_option(uci_to_option(e)); + uci_show_option(uci_to_option(e), true); } } @@ -251,8 +295,10 @@ static void uci_show_changes(struct uci_package *p) printf("%s%s.%s", prefix, p->e.name, h->section); if (e->name) printf(".%s", e->name); - if (h->cmd != UCI_CMD_REMOVE) - printf("%s%s", op, h->value); + if (h->cmd != UCI_CMD_REMOVE) { + printf("%s", op); + uci_print_value(stdout, h->value); + } printf("\n"); } } @@ -261,7 +307,7 @@ static int package_cmd(int cmd, char *tuple) { struct uci_element *e = NULL; struct uci_ptr ptr; - int ret = 0; + int ret = 1; if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) { cli_perror(); @@ -274,21 +320,25 @@ static int package_cmd(int cmd, char *tuple) uci_show_changes(ptr.p); break; case CMD_COMMIT: - if (flags & CLI_FLAG_NOCOMMIT) - return 0; + if (flags & CLI_FLAG_NOCOMMIT) { + ret = 0; + goto out; + } if (uci_commit(ctx, &ptr.p, false) != UCI_OK) { cli_perror(); - ret = 1; + goto out; } break; case CMD_EXPORT: - uci_export(ctx, stdout, ptr.p, true); + if (uci_export(ctx, stdout, ptr.p, true) != UCI_OK) { + goto out; + } break; case CMD_SHOW: if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) { ctx->err = UCI_ERR_NOTFOUND; cli_perror(); - ret = 1; + goto out; } switch(e->type) { case UCI_TYPE_PACKAGE: @@ -298,15 +348,18 @@ static int package_cmd(int cmd, char *tuple) uci_show_section(ptr.s); break; case UCI_TYPE_OPTION: - uci_show_option(ptr.o); + uci_show_option(ptr.o, true); break; default: /* should not happen */ - return 1; + goto out; } break; } + ret = 0; + +out: if (ptr.p) uci_unload(ctx, ptr.p); return ret; @@ -360,6 +413,7 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv) { char **configs = NULL; char **p; + int ret = 1; if (argc > 2) return 255; @@ -369,14 +423,17 @@ static int uci_do_package_cmd(int cmd, int argc, char **argv) if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs) { cli_perror(); - return 1; + goto out; } for (p = configs; *p; p++) { package_cmd(cmd, *p); } - return 0; + ret = 0; +out: + free(configs); + return ret; } static int uci_do_add(int argc, char **argv) @@ -440,7 +497,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv) printf("%s\n", ptr.s->type); break; case UCI_TYPE_OPTION: - uci_show_value(ptr.o); + uci_show_value(ptr.o, false); break; default: break; @@ -502,7 +559,7 @@ static int uci_batch_cmd(void) for(i = 0; i <= MAX_ARGS; i++) { if (i == MAX_ARGS) { - fprintf(stderr, "Too many arguments\n"); + cli_error("Too many arguments\n"); return 1; } argv[i] = NULL; @@ -515,7 +572,7 @@ static int uci_batch_cmd(void) break; argv[i] = strdup(argv[i]); if (!argv[i]) { - perror("uci"); + cli_error("uci: %s", strerror(errno)); return 1; } } @@ -529,8 +586,7 @@ static int uci_batch_cmd(void) return 0; for (j = 0; j < i; j++) { - if (argv[j]) - free(argv[j]); + free(argv[j]); } return ret; @@ -548,7 +604,7 @@ static int uci_batch(void) if (ret == 254) return 0; else if (ret == 255) - fprintf(stderr, "Unknown command\n"); + cli_error("Unknown command\n"); /* clean up */ uci_foreach_element_safe(&ctx->root, tmp, e) { @@ -638,7 +694,7 @@ int main(int argc, char **argv) input = stdin; ctx = uci_alloc_context(); if (!ctx) { - fprintf(stderr, "Out of memory\n"); + cli_error("Out of memory\n"); return 1; } @@ -652,13 +708,14 @@ int main(int argc, char **argv) break; case 'f': if (input != stdin) { - perror("uci"); + fclose(input); + cli_error("Too many input files.\n"); return 1; } input = fopen(optarg, "r"); if (!input) { - perror("uci"); + cli_error("uci: %s", strerror(errno)); return 1; } break;