add revert, merge package handler functions

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index c6b7ebc..6e03f18 100644 (file)
--- a/list.c
+++ b/list.c
@@ -74,7 +74,7 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 
 error:
        free(ptr);
-       UCI_THROW(ctx, ctx->errno);
+       UCI_THROW(ctx, ctx->err);
 
 done:
        return e;
@@ -115,6 +115,34 @@ uci_free_option(struct uci_option *o)
        uci_free_element(&o->e);
 }
 
+/* fix up an unnamed section, e.g. after adding options to it */
+static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
+{
+       unsigned int hash = ~0;
+       struct uci_element *e;
+       char buf[16];
+
+       if (!s || s->e.name)
+               return;
+
+       /*
+        * Generate a name for unnamed sections. This is used as reference
+        * when locating or updating the section from apps/scripts.
+        * To make multiple concurrent versions somewhat safe for updating,
+        * the name is generated from a hash of its type and name/value
+        * pairs of its option, and it is prefixed by a counter value.
+        * If the order of the unnamed sections changes for some reason,
+        * updates to them will be rejected.
+        */
+       hash = djbhash(hash, s->type);
+       uci_foreach_element(&s->options, e) {
+               hash = djbhash(hash, e->name);
+               hash = djbhash(hash, uci_to_option(e)->value);
+       }
+       sprintf(buf, "cfg%02x%04x", ++s->package->n_section, hash % (1 << 16));
+       s->e.name = uci_strdup(ctx, buf);
+}
+
 static struct uci_section *
 uci_alloc_section(struct uci_package *p, const char *type, const char *name)
 {
@@ -131,6 +159,7 @@ uci_alloc_section(struct uci_package *p, const char *type, const char *name)
        strcpy(s->type, type);
        if (name == NULL)
                s->anonymous = true;
+       p->n_section++;
 
        uci_list_add(&p->sections, &s->e.list);
 
@@ -151,7 +180,7 @@ uci_free_section(struct uci_section *s)
        uci_free_element(&s->e);
 }
 
-static struct uci_package *
+__plugin struct uci_package *
 uci_alloc_package(struct uci_context *ctx, const char *name)
 {
        struct uci_package *p;
@@ -188,7 +217,7 @@ uci_free_package(struct uci_package **package)
        *package = NULL;
 }
 
-static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
+static struct uci_element *uci_lookup_list(struct uci_list *list, const char *name)
 {
        struct uci_element *e;
 
@@ -207,17 +236,17 @@ 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, uci_validate_name(section));
+       UCI_ASSERT(ctx, section && uci_validate_name(section));
        if (option)
                UCI_ASSERT(ctx, uci_validate_name(option));
 
-       e = uci_lookup_list(ctx, &p->sections, section);
+       e = uci_lookup_list(&p->sections, section);
        if (!e)
                goto notfound;
 
        if (option) {
                s = uci_to_section(e);
-               e = uci_lookup_list(ctx, &s->options, option);
+               e = uci_lookup_list(&s->options, option);
                if (!e)
                        goto notfound;
        }
@@ -262,7 +291,7 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e)
        }
 
        p = s->package;
-       if (!internal && p->confdir)
+       if (!internal && p->has_history)
                uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, s->e.name, option, NULL);
 
        switch(e->type) {
@@ -325,7 +354,7 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
                return 0;
        }
        p = s->package;
-       if (!internal && p->confdir)
+       if (!internal && p->has_history)
                uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
 
        uci_list_del(&e->list);
@@ -359,7 +388,7 @@ int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, ch
        /* NB: p, section, option validated by uci_lookup */
        UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
 
-       if (!internal && p->confdir)
+       if (!internal && p->has_history)
                uci_add_history(ctx, &p->history, UCI_CMD_RENAME, section, option, name);
 
        name = uci_strdup(ctx, name);
@@ -370,6 +399,21 @@ int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, ch
        return 0;
 }
 
+int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type, struct uci_section **res)
+{
+       bool internal = ctx->internal;
+       struct uci_section *s;
+
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, p != NULL);
+       s = uci_alloc_section(p, type, NULL);
+       uci_fixup_section(ctx, s);
+       *res = s;
+       if (!internal && p->has_history)
+               uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
+
+       return 0;
+}
 
 int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
 {
@@ -409,7 +453,7 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
         * if the section/option is to be modified and it is not found
         * create a new element in the appropriate list
         */
-       e = uci_lookup_list(ctx, &p->sections, section);
+       e = uci_lookup_list(&p->sections, section);
        if (!e)
                goto notfound;
 
@@ -418,7 +462,7 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
                ctx->pctx->section = s;
 
        if (option) {
-               e = uci_lookup_list(ctx, &s->options, option);
+               e = uci_lookup_list(&s->options, option);
                if (!e)
                        goto notfound;
                o = uci_to_option(e);
@@ -451,8 +495,8 @@ notfound:
                UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
        /* now add the missing entry */
-       if (!internal && p->confdir)
-               uci_add_history(ctx, &p->history, UCI_CMD_ADD, section, option, value);
+       if (!internal && p->has_history)
+               uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
        if (s) {
                o = uci_alloc_option(s, option, value);
                if (result)