uci: maintain option position in uci_add_list

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index 24ed2ee6ddf1fa84adf84acc11ab455086f83df9..e6d631c43bbafeb6272e6c0256978394191dd9a2 100644 (file)
--- a/list.c
+++ b/list.c
@@ -76,7 +76,7 @@ uci_free_element(struct uci_element *e)
 }
 
 static struct uci_option *
-uci_alloc_option(struct uci_section *s, const char *name, const char *value)
+uci_alloc_option(struct uci_section *s, const char *name, const char *value, struct uci_list *after)
 {
        struct uci_package *p = s->package;
        struct uci_context *ctx = p->ctx;
@@ -87,7 +87,7 @@ uci_alloc_option(struct uci_section *s, const char *name, const char *value)
        o->v.string = uci_dataptr(o);
        o->section = s;
        strcpy(o->v.string, value);
-       uci_list_add(&s->options, &o->e.list);
+       uci_list_insert(after ? after : s->options.prev, &o->e.list);
 
        return o;
 }
@@ -115,7 +115,7 @@ uci_free_option(struct uci_option *o)
 }
 
 static struct uci_option *
-uci_alloc_list(struct uci_section *s, const char *name)
+uci_alloc_list(struct uci_section *s, const char *name, struct uci_list *after)
 {
        struct uci_package *p = s->package;
        struct uci_context *ctx = p->ctx;
@@ -125,7 +125,7 @@ uci_alloc_list(struct uci_section *s, const char *name)
        o->type = UCI_TYPE_LIST;
        o->section = s;
        uci_list_init(&o->v.list);
-       uci_list_add(&s->options, &o->e.list);
+       uci_list_insert(after ? after : s->options.prev, &o->e.list);
 
        return o;
 }
@@ -497,19 +497,6 @@ uci_expand_ptr(struct uci_context *ctx, struct uci_ptr *ptr, bool complete)
                return NULL;
 }
 
-static void uci_add_element_list(struct uci_context *ctx, struct uci_ptr *ptr, bool internal)
-{
-       struct uci_element *e;
-       struct uci_package *p;
-
-       p = ptr->p;
-       if (!internal && p->has_delta)
-               uci_add_delta(ctx, &p->delta, UCI_CMD_LIST_ADD, ptr->section, ptr->option, ptr->value);
-
-       e = uci_alloc_generic(ctx, UCI_TYPE_ITEM, ptr->value, sizeof(struct uci_option));
-       uci_list_add(&ptr->o->v.list, &e->list);
-}
-
 int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 {
        /* NB: UCI_INTERNAL use means without delta tracking */
@@ -623,8 +610,7 @@ int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
 {
        /* NB: UCI_INTERNAL use means without delta tracking */
        bool internal = ctx && ctx->internal;
-       struct uci_option *volatile prev = NULL;
-       const char *volatile value2 = NULL;
+       struct uci_element *volatile e1 = NULL, *volatile e2 = NULL;
 
        UCI_HANDLE_ERR(ctx);
 
@@ -632,32 +618,48 @@ int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
        UCI_ASSERT(ctx, ptr->s);
        UCI_ASSERT(ctx, ptr->value);
 
-       if (ptr->o) {
-               switch (ptr->o->type) {
-               case UCI_TYPE_STRING:
-                       /* we already have a string value, convert that to a list */
-                       prev = ptr->o;
-                       value2 = ptr->value;
-                       ptr->value = ptr->o->v.string;
-                       break;
-               case UCI_TYPE_LIST:
-                       uci_add_element_list(ctx, ptr, internal);
-                       return 0;
-               default:
-                       UCI_THROW(ctx, UCI_ERR_INVAL);
-                       break;
-               }
+       if (ptr->o && ptr->o->type != UCI_TYPE_LIST && ptr->o->type != UCI_TYPE_STRING) {
+               UCI_THROW(ctx, UCI_ERR_INVAL);
        }
 
-       ptr->o = uci_alloc_list(ptr->s, ptr->option);
-       if (prev) {
-               uci_add_element_list(ctx, ptr, true);
-               uci_free_option(prev);
-               ptr->value = value2;
+       /* create new item */
+       e1 = uci_alloc_generic(ctx, UCI_TYPE_ITEM, ptr->value, sizeof(struct uci_option));
+
+       if (!ptr->o) {
+               /* create new list */
+               UCI_TRAP_SAVE(ctx, error);
+               ptr->o = uci_alloc_list(ptr->s, ptr->option, NULL);
+               UCI_TRAP_RESTORE(ctx);
+               ptr->last = &ptr->o->e;
+       } else if (ptr->o->type == UCI_TYPE_STRING) {
+               /* create new list and add old string value as item to list */
+               struct uci_option *old = ptr->o;
+               UCI_TRAP_SAVE(ctx, error);
+               e2 = uci_alloc_generic(ctx, UCI_TYPE_ITEM, old->v.string, sizeof(struct uci_option));
+               ptr->o = uci_alloc_list(ptr->s, ptr->option, &old->e.list);
+               UCI_TRAP_RESTORE(ctx);
+               uci_list_add(&ptr->o->v.list, &e2->list);
+
+               /* remove old option */
+               if (ptr->option == old->e.name)
+                       ptr->option = ptr->o->e.name;
+               uci_free_option(old);
+               ptr->last = &ptr->o->e;
        }
-       uci_add_element_list(ctx, ptr, internal);
+
+       /* add new item to list */
+       uci_list_add(&ptr->o->v.list, &e1->list);
+
+       if (!internal && ptr->p->has_delta)
+               uci_add_delta(ctx, &ptr->p->delta, UCI_CMD_LIST_ADD, ptr->section, ptr->option, ptr->value);
 
        return 0;
+error:
+       if (e1 != NULL)
+               uci_free_element(e1);
+       if (e2 != NULL)
+               uci_free_element(e2);
+       UCI_THROW(ctx, ctx->err);
 }
 
 int uci_del_list(struct uci_context *ctx, struct uci_ptr *ptr)
@@ -719,22 +721,25 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
 
                return uci_delete(ctx, ptr);
        } else if (!ptr->o && ptr->option) { /* new option */
-               ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value);
+               ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value, NULL);
                ptr->last = &ptr->o->e;
        } else if (!ptr->s && ptr->section) { /* new section */
                ptr->s = uci_alloc_section(ptr->p, ptr->value, ptr->section);
                ptr->last = &ptr->s->e;
        } else if (ptr->o && ptr->option) { /* update option */
-               struct uci_option *o;
-
-               if ((ptr->o->type == UCI_TYPE_STRING) &&
-                       !strcmp(ptr->o->v.string, ptr->value))
+               if (ptr->o->type == UCI_TYPE_STRING && !strcmp(ptr->o->v.string, ptr->value))
                        return 0;
 
-               o = ptr->o;
-               ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value);
-               uci_free_option(o);
-               ptr->last = &ptr->o->e;
+               if (ptr->o->type == UCI_TYPE_STRING && strlen(ptr->o->v.string) == strlen(ptr->value)) {
+                       strcpy(ptr->o->v.string, ptr->value);
+               } else {
+                       struct uci_option *old = ptr->o;
+                       ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value, &old->e.list);
+                       if (ptr->option == old->e.name)
+                               ptr->option = ptr->o->e.name;
+                       uci_free_option(old);
+                       ptr->last = &ptr->o->e;
+               }
        } else if (ptr->s && ptr->section) { /* update section */
                char *s = uci_strdup(ctx, ptr->value);