uci: properly close input before exit

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 41a78cb..e1e0a66 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -27,7 +27,6 @@ static enum {
        CLI_FLAG_NOCOMMIT = (1 << 2),
        CLI_FLAG_BATCH =    (1 << 3),
        CLI_FLAG_SHOW_EXT = (1 << 4),
-       CLI_FLAG_NOPLUGINS= (1 << 5),
 } flags;
 
 static FILE *input;
@@ -147,7 +146,6 @@ static void uci_usage(void)
                "\t-c <path>  set the search path for config files (default: /etc/config)\n"
                "\t-d <str>   set the delimiter for list values in uci show\n"
                "\t-f <file>  use <file> as input instead of stdin\n"
-               "\t-L         do not load any plugins\n"
                "\t-m         when importing, merge data into an existing package\n"
                "\t-n         name unnamed sections on export (default)\n"
                "\t-N         don't name unnamed sections\n"
@@ -170,18 +168,41 @@ static void cli_perror(void)
        uci_perror(ctx, appname);
 }
 
-static void uci_show_value(struct uci_option *o)
+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");
@@ -192,13 +213,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)
@@ -211,7 +232,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);
        }
 }
 
@@ -253,8 +274,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");
        }
 }
@@ -263,7 +286,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();
@@ -276,21 +299,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:
@@ -300,15 +327,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;
@@ -362,6 +392,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;
@@ -371,14 +402,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)
@@ -442,7 +476,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;
@@ -531,8 +565,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;
@@ -654,6 +687,7 @@ int main(int argc, char **argv)
                                break;
                        case 'f':
                                if (input != stdin) {
+                                       fclose(input);
                                        perror("uci");
                                        return 1;
                                }
@@ -664,9 +698,6 @@ int main(int argc, char **argv)
                                        return 1;
                                }
                                break;
-                       case 'L':
-                               flags |= CLI_FLAG_NOPLUGINS;
-                               break;
                        case 'm':
                                flags |= CLI_FLAG_MERGE;
                                break;
@@ -712,9 +743,6 @@ int main(int argc, char **argv)
                return 0;
        }
 
-       if (!(flags & CLI_FLAG_NOPLUGINS))
-               uci_load_plugins(ctx, NULL);
-
        ret = uci_cmd(argc - 1, argv + 1);
        if (input != stdin)
                fclose(input);