push out uci error messages to lua as well

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index 0cb6dad..0ddf409 100644 (file)
--- a/list.c
+++ b/list.c
@@ -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;
 }
 
@@ -620,6 +621,12 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
                UCI_ASSERT(ctx, uci_validate_str(ptr->value, false));
        }
 
+       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 +634,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;