uci: fix excessive reorder delta entry duplication

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index 006e2a0..e6ef1c1 100644 (file)
--- a/list.c
+++ b/list.c
@@ -217,7 +217,7 @@ uci_free_section(struct uci_section *s)
        uci_free_element(&s->e);
 }
 
-__plugin struct uci_package *
+__private struct uci_package *
 uci_alloc_package(struct uci_context *ctx, const char *name)
 {
        struct uci_package *p;
@@ -515,12 +515,13 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
 {
        struct uci_package *p = s->package;
+       bool internal = ctx && ctx->internal;
        char order[32];
 
        UCI_HANDLE_ERR(ctx);
 
        uci_list_set_pos(&s->package->sections, &s->e.list, pos);
-       if (!ctx->internal && p->has_delta) {
+       if (!internal && p->has_delta) {
                sprintf(order, "%d", pos);
                uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
        }
@@ -549,19 +550,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->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;