blob: allow values to be added to blobmsg using multiple different types, but suppres...

[project/uci.git] / cli.c

diff --git a/cli.c b/cli.c
index 7bef7a9..6fbbfe9 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;
@@ -38,6 +37,7 @@ enum {
        CMD_GET,
        CMD_SET,
        CMD_ADD_LIST,
+       CMD_DEL_LIST,
        CMD_DEL,
        CMD_RENAME,
        CMD_REVERT,
@@ -98,6 +98,8 @@ uci_lookup_section_ref(struct uci_section *s)
        }
        if (!ti) {
                ti = malloc(sizeof(struct uci_type_list));
+               if (!ti)
+                       return NULL;
                memset(ti, 0, sizeof(struct uci_type_list));
                ti->next = type_list;
                type_list = ti;
@@ -110,8 +112,12 @@ uci_lookup_section_ref(struct uci_section *s)
        } else {
                typestr = realloc(typestr, maxlen);
        }
-       sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
+       if (typestr)
+               sprintf(typestr, "@%s[%d]", ti->name, ti->idx);
+
        ti->idx++;
+
        return typestr;
 }
 
@@ -127,10 +133,11 @@ static void uci_usage(void)
                "\tcommit     [<config>]\n"
                "\tadd        <config> <section-type>\n"
                "\tadd_list   <config>.<section>.<option>=<string>\n"
+               "\tdel_list   <config>.<section>.<option>=<string>\n"
                "\tshow       [<config>[.<section>[.<option>]]]\n"
                "\tget        <config>.<section>[.<option>]\n"
                "\tset        <config>.<section>[.<option>]=<value>\n"
-               "\tdelete     <config>[.<section[.<option>]]\n"
+               "\tdelete     <config>[.<section>[[.<option>][=<id>]]]\n"
                "\trename     <config>.<section>[.<option>]=<name>\n"
                "\trevert     <config>[.<section>[.<option>]]\n"
                "\treorder    <config>.<section>=<position>\n"
@@ -139,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"
@@ -224,8 +230,8 @@ static void uci_show_changes(struct uci_package *p)
 {
        struct uci_element *e;
 
-       uci_foreach_element(&p->saved_history, e) {
-               struct uci_history *h = uci_to_history(e);
+       uci_foreach_element(&p->saved_delta, e) {
+               struct uci_delta *h = uci_to_delta(e);
                char *prefix = "";
                char *op = "=";
 
@@ -236,6 +242,9 @@ static void uci_show_changes(struct uci_package *p)
                case UCI_CMD_LIST_ADD:
                        op = "+=";
                        break;
+               case UCI_CMD_LIST_DEL:
+                       op = "-=";
+                       break;
                default:
                        break;
                }
@@ -252,6 +261,7 @@ static int package_cmd(int cmd, char *tuple)
 {
        struct uci_element *e = NULL;
        struct uci_ptr ptr;
+       int ret = 0;
 
        if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
                cli_perror();
@@ -266,8 +276,10 @@ static int package_cmd(int cmd, char *tuple)
        case CMD_COMMIT:
                if (flags & CLI_FLAG_NOCOMMIT)
                        return 0;
-               if (uci_commit(ctx, &ptr.p, false) != UCI_OK)
+               if (uci_commit(ctx, &ptr.p, false) != UCI_OK) {
                        cli_perror();
+                       ret = 1;
+               }
                break;
        case CMD_EXPORT:
                uci_export(ctx, stdout, ptr.p, true);
@@ -276,7 +288,7 @@ static int package_cmd(int cmd, char *tuple)
                if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
                        ctx->err = UCI_ERR_NOTFOUND;
                        cli_perror();
-                       return 1;
+                       ret = 1;
                }
                switch(e->type) {
                        case UCI_TYPE_PACKAGE:
@@ -295,8 +307,9 @@ static int package_cmd(int cmd, char *tuple)
                break;
        }
 
-       uci_unload(ctx, ptr.p);
-       return 0;
+       if (ptr.p)
+               uci_unload(ctx, ptr.p);
+       return ret;
 }
 
 static int uci_do_import(int argc, char **argv)
@@ -399,6 +412,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
        struct uci_element *e;
        struct uci_ptr ptr;
        int ret = UCI_OK;
+       int dummy;
 
        if (argc != 2)
                return 255;
@@ -408,7 +422,9 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
                return 1;
        }
 
-       if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_ADD_LIST) && (cmd != CMD_RENAME) && (cmd != CMD_REORDER))
+       if (ptr.value && (cmd != CMD_SET) && (cmd != CMD_DEL) &&
+           (cmd != CMD_ADD_LIST) && (cmd != CMD_DEL_LIST) &&
+           (cmd != CMD_RENAME) && (cmd != CMD_REORDER))
                return 1;
 
        e = ptr.last;
@@ -443,8 +459,11 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
        case CMD_ADD_LIST:
                ret = uci_add_list(ctx, &ptr);
                break;
+       case CMD_DEL_LIST:
+               ret = uci_del_list(ctx, &ptr);
+               break;
        case CMD_REORDER:
-               if (!ptr.s) {
+               if (!ptr.s || !ptr.value) {
                        ctx->err = UCI_ERR_NOTFOUND;
                        cli_perror();
                        return 1;
@@ -452,6 +471,8 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
                ret = uci_reorder_section(ctx, ptr.s, strtoul(ptr.value, NULL, 10));
                break;
        case CMD_DEL:
+               if (ptr.value && !sscanf(ptr.value, "%d", &dummy))
+                       return 1;
                ret = uci_delete(ctx, &ptr);
                break;
        }
@@ -508,8 +529,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;
@@ -575,11 +595,14 @@ static int uci_cmd(int argc, char **argv)
                cmd = CMD_ADD;
        else if (!strcasecmp(argv[0], "add_list"))
                cmd = CMD_ADD_LIST;
+       else if (!strcasecmp(argv[0], "del_list"))
+               cmd = CMD_DEL_LIST;
        else
                cmd = -1;
 
        switch(cmd) {
                case CMD_ADD_LIST:
+               case CMD_DEL_LIST:
                case CMD_GET:
                case CMD_SET:
                case CMD_DEL:
@@ -627,15 +650,17 @@ int main(int argc, char **argv)
                                delimiter = optarg;
                                break;
                        case 'f':
+                               if (input != stdin) {
+                                       perror("uci");
+                                       return 1;
+                               }
+
                                input = fopen(optarg, "r");
                                if (!input) {
                                        perror("uci");
                                        return 1;
                                }
                                break;
-                       case 'L':
-                               flags |= CLI_FLAG_NOPLUGINS;
-                               break;
                        case 'm':
                                flags |= CLI_FLAG_MERGE;
                                break;
@@ -653,10 +678,10 @@ int main(int argc, char **argv)
                                ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
                                break;
                        case 'p':
-                               uci_add_history_path(ctx, optarg);
+                               uci_add_delta_path(ctx, optarg);
                                break;
                        case 'P':
-                               uci_add_history_path(ctx, ctx->savedir);
+                               uci_add_delta_path(ctx, ctx->savedir);
                                uci_set_savedir(ctx, optarg);
                                flags |= CLI_FLAG_NOCOMMIT;
                                break;
@@ -681,16 +706,12 @@ 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);
-       if (ret == 255) {
+
+       if (ret == 255)
                uci_usage();
-               return 0;
-       }
 
        uci_free_context(ctx);