make the uci_ptr struct reusable after a call to uci_delete()

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index 0cb6dad..9486ffb 100644 (file)
--- a/list.c
+++ b/list.c
@@ -322,7 +322,7 @@ uci_lookup_ext_section(struct uci_context *ctx, struct uci_ptr *ptr)
 
        if (!*name)
                name = NULL;
-       else if (!uci_validate_str(name, false))
+       else if (!uci_validate_type(name))
                goto error;
 
        /* if the given index is negative, it specifies the section number from 
@@ -358,7 +358,8 @@ error:
        UCI_THROW(ctx, UCI_ERR_INVAL);
 done:
        free(section);
-       ptr->section = e->name;
+       if (e)
+               ptr->section = e->name;
        return e;
 }
 
@@ -466,7 +467,7 @@ expand_ptr(struct uci_context *ctx, struct uci_ptr *ptr, bool complete)
        UCI_ASSERT(ctx, ptr != NULL);
 
        if (!(ptr->flags & UCI_LOOKUP_DONE))
-               uci_lookup_ptr(ctx, ptr, NULL, 1);
+               UCI_INTERNAL(uci_lookup_ptr, ctx, ptr, NULL, 1);
        if (complete && !(ptr->flags & UCI_LOOKUP_COMPLETE))
                UCI_THROW(ctx, UCI_ERR_NOTFOUND);
        UCI_ASSERT(ctx, ptr->p != NULL);
@@ -526,6 +527,9 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
                free(e->name);
        e->name = n;
 
+       if (e->type == UCI_TYPE_SECTION)
+               uci_to_section(e)->anonymous = false;
+
        return 0;
 }
 
@@ -563,6 +567,12 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
                uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
 
        uci_free_any(&e);
+
+       if (ptr->option)
+               ptr->o = NULL;
+       else if (ptr->section)
+               ptr->s = NULL;
+
        return 0;
 }
 
@@ -617,9 +627,15 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
        UCI_ASSERT(ctx, ptr->value);
        UCI_ASSERT(ctx, ptr->s || (!ptr->option && ptr->section));
        if (!ptr->option) {
-               UCI_ASSERT(ctx, uci_validate_str(ptr->value, false));
+               UCI_ASSERT(ctx, uci_validate_type(ptr->value));
        }
 
+       if (!ptr->o && ptr->s && ptr->option) {
+               struct uci_element *e;
+               e = uci_lookup_list(&ptr->s->options, ptr->option);
+               if (e)
+                       ptr->o = uci_to_option(e);
+       }
        if (!ptr->o && ptr->option) { /* new option */
                ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value);
                ptr->last = &ptr->o->e;
@@ -627,6 +643,9 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
                ptr->s = uci_alloc_section(ptr->p, ptr->value, ptr->section);
                ptr->last = &ptr->s->e;
        } else if (ptr->o && ptr->option) { /* update option */
+               if ((ptr->o->type == UCI_TYPE_STRING) &&
+                       !strcmp(ptr->o->v.string, ptr->value))
+                       return 0;
                uci_free_option(ptr->o);
                ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value);
                ptr->last = &ptr->o->e;