extend delete command so it can delete list elemets using index

diff --git a/cli.c b/cli.c
index f5dfce05187c9a506f91367cab740ab9522946e3..41a78cbccd34d4dfef1b20bb5042d0a85ed492eb 100644 (file)
--- a/cli.c
+++ b/cli.c
@@ -138,7 +138,7 @@ static void uci_usage(void)
                "\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"
@@ -414,6 +414,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;
@@ -423,7 +424,7 @@ static int uci_do_section_cmd(int cmd, int argc, char **argv)
                return 1;
        }
 
-       if (ptr.value && (cmd != CMD_SET) &&
+       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;
@@ -472,6 +473,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;
        }

diff --git a/delta.c b/delta.c
index 0a24f31194a36ce3ee24f6e6461df76b7da6825f..111321cdb7d97f26c840a4b1c36d55f53589bd59 100644 (file)
--- a/delta.c
+++ b/delta.c
@@ -480,7 +480,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
                if (e->name)
                        fprintf(f, ".%s", e->name);
 
-               if (h->cmd == UCI_CMD_REMOVE)
+               if (h->cmd == UCI_CMD_REMOVE && !h->value)
                        fprintf(f, "\n");
                else
                        fprintf(f, "=%s\n", h->value);

diff --git a/list.c b/list.c
index 006e2a0ca8d2741f84731c62fc80eecebf877ef9..bf0f376dacefc422cf2643bea9d7fc970da89005 100644 (file)
--- a/list.c
+++ b/list.c
@@ -549,19 +549,37 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
        /* NB: pass on internal flag to uci_del_element */
        bool internal = ctx && ctx->internal;
        struct uci_package *p;
-       struct uci_element *e;
+       struct uci_element *e1, *e2, *tmp;
+       int index;
 
        UCI_HANDLE_ERR(ctx);
 
-       e = uci_expand_ptr(ctx, ptr, true);
+       e1 = uci_expand_ptr(ctx, ptr, true);
        p = ptr->p;
 
        UCI_ASSERT(ctx, ptr->s);
 
+       if (ptr->value && ptr->o && ptr->o->type == UCI_TYPE_LIST) {
+               if (!sscanf(ptr->value, "%d", &index))
+                       return 1;
+
+               uci_foreach_element_safe(&ptr->o->v.list, tmp, e2) {
+                       if (index == 0) {
+                               if (!internal && p->has_delta)
+                                       uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, ptr->value);
+                               uci_free_option(uci_to_option(e2));
+                               return 0;
+                       }
+                       index--;
+               }
+
+               return 0;
+       }
+
        if (!internal && p->has_delta)
                uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
 
-       uci_free_any(&e);
+       uci_free_any(&e1);
 
        if (ptr->option)
                ptr->o = NULL;