implement history parsing

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index a70c2c5..19fe8c5 100644 (file)
--- a/list.c
+++ b/list.c
@@ -58,13 +58,18 @@ static struct uci_element *
 uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 {
        struct uci_element *e;
+       int datalen = size;
        void *ptr;
 
-       ptr = uci_malloc(ctx, size + strlen(name) + 1);
+       if (name)
+               datalen += strlen(name) + 1;
+       ptr = uci_malloc(ctx, datalen);
        e = (struct uci_element *) ptr;
        e->type = type;
-       e->name = (char *) ptr + size;
-       strcpy(e->name, name);
+       if (name) {
+               e->name = (char *) ptr + size;
+               strcpy(e->name, name);
+       }
        uci_list_init(&e->list);
 
        return e;
@@ -165,17 +170,19 @@ uci_free_package(struct uci_package *p)
 static inline void
 uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
 {
-       struct uci_history *h = (struct uci_history *) uci_malloc(ctx, sizeof(struct uci_history));
+       struct uci_history *h;
+       int size = 0;
+       char *ptr;
 
-       uci_list_init(&h->list);
+       h = uci_alloc_element(ctx, history, option, strlen(section) + strlen(value) + 2);
+       ptr = uci_dataptr(h);
        h->cmd = cmd;
-       h->section = section;
-       h->option = option;
-       h->value = value;
-       uci_list_add(&p->history, &h->list);
+       h->section = strcpy(ptr, section);
+       ptr += strlen(ptr) + 1;
+       h->value = strcpy(ptr, value);
+       uci_list_add(&p->history, &h->e.list);
 }
 
-
 static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
 {
        struct uci_element *e;
@@ -184,7 +191,7 @@ static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_l
                if (!strcmp(e->name, name))
                        return e;
        }
-       UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+       return NULL;
 }
 
 int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
@@ -196,25 +203,36 @@ int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_pac
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, res != NULL);
        UCI_ASSERT(ctx, p != NULL);
+       UCI_ASSERT(ctx, section != NULL);
 
        e = uci_lookup_list(ctx, &p->sections, section);
-       if (!option)
-               goto found;
+       if (!e)
+               goto notfound;
 
-       s = uci_to_section(e);
-       e = uci_lookup_list(ctx, &s->options, option);
+       if (option) {
+               s = uci_to_section(e);
+               e = uci_lookup_list(ctx, &s->options, option);
+       }
 
-found:
        *res = e;
        return 0;
+
+notfound:
+       UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+       return 0;
 }
 
 int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
 {
-       int size;
-       char *str;
+       bool internal = ctx->internal;
        struct uci_list *list;
        struct uci_element *e;
+       struct uci_package *p;
+       struct uci_section *s;
+       char *section;
+       char *option;
+       char *str;
+       int size;
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, value != NULL);
@@ -235,14 +253,23 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
        switch(e->type) {
        case UCI_TYPE_SECTION:
                size = sizeof(struct uci_section);
+               s = uci_to_section(e);
+               section = e->name;
+               option = NULL;
                break;
        case UCI_TYPE_OPTION:
                size = sizeof(struct uci_option);
+               s = uci_to_option(e)->section;
+               section = s->e.name;
+               option = e->name;
                break;
        default:
                UCI_THROW(ctx, UCI_ERR_INVAL);
-               break;
+               return 0;
        }
+       p = s->package;
+       if (!internal)
+               uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
 
        uci_list_del(&e->list);
        e = uci_realloc(ctx, e, size);
@@ -252,10 +279,10 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
 
        switch(e->type) {
        case UCI_TYPE_SECTION:
-               uci_to_section(e)->type = value;
+               uci_to_section(e)->type = str;
                break;
        case UCI_TYPE_OPTION:
-               uci_to_option(e)->value = value;
+               uci_to_option(e)->value = str;
                break;
        default:
                break;
@@ -271,17 +298,18 @@ int uci_set(struct uci_context *ctx, char *package, char *section, char *option,
        struct uci_section *s = NULL;
        struct uci_option *o = NULL;
        struct uci_history *h;
+       bool internal = ctx->internal;
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, package != NULL);
        UCI_ASSERT(ctx, section != NULL);
+       UCI_ASSERT(ctx, value != NULL);
 
        /*
         * look up the package, section and option (if set)
         * if the section/option is to be modified and it is not found
         * create a new element in the appropriate list
         */
-       UCI_TRAP_SAVE(ctx, notfound);
        e = uci_lookup_list(ctx, &ctx->root, package);
        if (!e)
                goto notfound;
@@ -290,15 +318,14 @@ int uci_set(struct uci_context *ctx, char *package, char *section, char *option,
        e = uci_lookup_list(ctx, &p->sections, section);
        if (!e)
                goto notfound;
-       s = uci_to_section(e);
 
+       s = uci_to_section(e);
        if (option) {
                e = uci_lookup_list(ctx, &s->options, option);
                if (!e)
                        goto notfound;
                o = uci_to_option(e);
        }
-       UCI_TRAP_RESTORE(ctx);
 
        /* 
         * no unknown element was supplied, assume that we can just update 
@@ -309,8 +336,11 @@ int uci_set(struct uci_context *ctx, char *package, char *section, char *option,
        else
                e = &s->e;
 
-       uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
-       return uci_set_element_value(ctx, &e, value);
+       if (!internal)
+               return uci_set_element_value(ctx, &e, value);
+
+       UCI_INTERNAL(uci_set_element_value, ctx, &e, value);
+       return 0;
 
 notfound:
        /* 
@@ -320,14 +350,15 @@ notfound:
         * an option was supplied, but the section wasn't found
         */
        if (!p || (!s && option))
-               UCI_THROW(ctx, ctx->errno);
+               UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
        /* now add the missing entry */
-       uci_add_history(ctx, p, UCI_CMD_ADD, section, option, value);
+       if (!internal)
+               uci_add_history(ctx, p, UCI_CMD_ADD, section, option, value);
        if (s)
                uci_alloc_option(s, option, value);
        else
-               uci_alloc_section(p, section, value);
+               uci_alloc_section(p, value, section);
 
        return 0;
 }