add missing include statement

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index 66e83ec..e817118 100644 (file)
--- a/list.c
+++ b/list.c
@@ -2,9 +2,9 @@
  * libuci - Library for the Unified Configuration Interface
  * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
  *
  * libuci - Library for the Unified Configuration Interface
  * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
  *

- * this program is free software; you can redistribute it and/or modify
- * it under the terms of the gnu lesser general public license version 2.1
- * as published by the free software foundation
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation

  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -151,44 +151,6 @@ uci_free_section(struct uci_section *s)
        uci_free_element(&s->e);
 }
 
        uci_free_element(&s->e);
 }
 

-/* record a change that was done to a package */
-static void
-uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
-{
-       struct uci_history *h;
-       int size = strlen(section) + 1;
-       char *ptr;
-
-       if (!p->confdir)
-               return;
-
-       if (value)
-               size += strlen(section) + 1;
-
-       h = uci_alloc_element(ctx, history, option, size);
-       ptr = uci_dataptr(h);
-       h->cmd = cmd;
-       h->section = strcpy(ptr, section);
-       if (value) {
-               ptr += strlen(ptr) + 1;
-               h->value = strcpy(ptr, value);
-       }
-       uci_list_add(&p->history, &h->e.list);
-}
-
-static void
-uci_free_history(struct uci_history *h)
-{
-       if (!h)
-               return;
-       if ((h->section != NULL) &&
-               (h->section != uci_dataptr(h))) {
-               free(h->section);
-               free(h->value);
-       }
-       uci_free_element(&h->e);
-}
-

 static struct uci_package *
 uci_alloc_package(struct uci_context *ctx, const char *name)
 {
 static struct uci_package *
 uci_alloc_package(struct uci_context *ctx, const char *name)
 {


@@ -198,6 +160,7 @@ uci_alloc_package(struct uci_context *ctx, const char *name)
        p->ctx = ctx;
        uci_list_init(&p->sections);
        uci_list_init(&p->history);
        p->ctx = ctx;
        uci_list_init(&p->sections);
        uci_list_init(&p->history);

+       uci_list_init(&p->saved_history);

        return p;
 }
 
        return p;
 }
 


@@ -218,6 +181,9 @@ uci_free_package(struct uci_package **package)
        uci_foreach_element_safe(&p->history, tmp, e) {
                uci_free_history(uci_to_history(e));
        }
        uci_foreach_element_safe(&p->history, tmp, e) {
                uci_free_history(uci_to_history(e));
        }

+       uci_foreach_element_safe(&p->saved_history, tmp, e) {
+               uci_free_history(uci_to_history(e));
+       }

        uci_free_element(&p->e);
        *package = NULL;
 }
        uci_free_element(&p->e);
        *package = NULL;
 }


@@ -241,7 +207,9 @@ 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_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, res != NULL);
        UCI_ASSERT(ctx, p != NULL);

-       UCI_ASSERT(ctx, section != NULL);
+       UCI_ASSERT(ctx, uci_validate_name(section));
+       if (option)
+               UCI_ASSERT(ctx, uci_validate_name(option));

 
        e = uci_lookup_list(ctx, &p->sections, section);
        if (!e)
 
        e = uci_lookup_list(ctx, &p->sections, section);
        if (!e)


@@ -292,8 +260,8 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e)
        }
 
        p = s->package;
        }
 
        p = s->package;

-       if (!internal)
-               uci_add_history(ctx, p, UCI_CMD_REMOVE, s->e.name, option, NULL);
+       if (!internal && p->confdir)
+               uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, s->e.name, option, NULL);

 
        switch(e->type) {
        case UCI_TYPE_SECTION:
 
        switch(e->type) {
        case UCI_TYPE_SECTION:


@@ -322,9 +290,7 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
        int size;
 
        UCI_HANDLE_ERR(ctx);
        int size;
 
        UCI_HANDLE_ERR(ctx);

-       UCI_ASSERT(ctx, value != NULL);
-       UCI_ASSERT(ctx, element != NULL);
-       UCI_ASSERT(ctx, *element != NULL);
+       UCI_ASSERT(ctx, (element != NULL) && (*element != NULL));

 
        /* what the 'value' of an element means depends on the type
         * for a section, the 'value' means its type
 
        /* what the 'value' of an element means depends on the type
         * for a section, the 'value' means its type


@@ -339,12 +305,14 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
        list = e->list.prev;
        switch(e->type) {
        case UCI_TYPE_SECTION:
        list = e->list.prev;
        switch(e->type) {
        case UCI_TYPE_SECTION:

+               UCI_ASSERT(ctx, uci_validate_str(value, false));

                size = sizeof(struct uci_section);
                s = uci_to_section(e);
                section = e->name;
                option = NULL;
                break;
        case UCI_TYPE_OPTION:
                size = sizeof(struct uci_section);
                s = uci_to_section(e);
                section = e->name;
                option = NULL;
                break;
        case UCI_TYPE_OPTION:

+               UCI_ASSERT(ctx, value != NULL);

                size = sizeof(struct uci_option);
                s = uci_to_option(e)->section;
                section = s->e.name;
                size = sizeof(struct uci_option);
                s = uci_to_option(e)->section;
                section = s->e.name;


@@ -355,8 +323,8 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
                return 0;
        }
        p = s->package;
                return 0;
        }
        p = s->package;

-       if (!internal)
-               uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
+       if (!internal && p->confdir)
+               uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);

 
        uci_list_del(&e->list);
        e = uci_realloc(ctx, e, size);
 
        uci_list_del(&e->list);
        e = uci_realloc(ctx, e, size);


@@ -385,13 +353,12 @@ int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, ch
        struct uci_element *e;
 
        UCI_HANDLE_ERR(ctx);
        struct uci_element *e;
 
        UCI_HANDLE_ERR(ctx);

-       UCI_ASSERT(ctx, p != NULL);
-       UCI_ASSERT(ctx, section != NULL);

 
 

+       /* NB: p, section, option validated by uci_lookup */

        UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
 
        UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
 

-       if (!internal)
-               uci_add_history(ctx, p, UCI_CMD_RENAME, section, option, name);
+       if (!internal && p->confdir)
+               uci_add_history(ctx, &p->history, UCI_CMD_RENAME, section, option, name);

 
        name = uci_strdup(ctx, name);
        if (e->name)
 
        name = uci_strdup(ctx, name);
        if (e->name)


@@ -409,16 +376,12 @@ int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, ch
        struct uci_element *e;
 
        UCI_HANDLE_ERR(ctx);
        struct uci_element *e;
 
        UCI_HANDLE_ERR(ctx);

-       UCI_ASSERT(ctx, p != NULL);
-       UCI_ASSERT(ctx, section != NULL);

 
 

+       /* NB: p, section, option validated by uci_lookup */

        UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
 
        UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
 

-       if (!internal)
-               return uci_del_element(ctx, e);
-       UCI_INTERNAL(uci_del_element, ctx, e);
-
-       return 0;
+       ctx->internal = internal;
+       return uci_del_element(ctx, e);

 }
 
 int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value)
 }
 
 int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value)


@@ -431,8 +394,13 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, p != NULL);
 
        UCI_HANDLE_ERR(ctx);
        UCI_ASSERT(ctx, p != NULL);

-       UCI_ASSERT(ctx, section != NULL);
-       UCI_ASSERT(ctx, value != NULL);
+       UCI_ASSERT(ctx, uci_validate_name(section));
+       if (option) {
+               UCI_ASSERT(ctx, uci_validate_name(option));
+               UCI_ASSERT(ctx, value != NULL);
+       } else {
+               UCI_ASSERT(ctx, uci_validate_str(value, false));
+       }

 
        /*
         * look up the package, section and option (if set)
 
        /*
         * look up the package, section and option (if set)


@@ -444,7 +412,7 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
                goto notfound;
 
        s = uci_to_section(e);
                goto notfound;
 
        s = uci_to_section(e);

-       if (ctx->pctx)
+       if (ctx->pctx && ctx->pctx->merge)

                ctx->pctx->section = s;
 
        if (option) {
                ctx->pctx->section = s;
 
        if (option) {


@@ -463,11 +431,8 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
        else
                e = &s->e;
 
        else
                e = &s->e;
 

-       if (!internal)
-               return uci_set_element_value(ctx, &e, value);
-
-       UCI_INTERNAL(uci_set_element_value, ctx, &e, value);
-       return 0;
+       ctx->internal = internal;
+       return uci_set_element_value(ctx, &e, value);

 
 notfound:
        /* 
 
 notfound:
        /* 


@@ -480,13 +445,13 @@ notfound:
                UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
        /* now add the missing entry */
                UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
        /* now add the missing entry */

-       if (!internal)
-               uci_add_history(ctx, p, UCI_CMD_ADD, section, option, value);
+       if (!internal && p->confdir)
+               uci_add_history(ctx, &p->history, UCI_CMD_ADD, section, option, value);

        if (s)
                uci_alloc_option(s, option, value);
        else {
                s = uci_alloc_section(p, value, section);
        if (s)
                uci_alloc_option(s, option, value);
        else {
                s = uci_alloc_section(p, value, section);

-               if (ctx->pctx)
+               if (ctx->pctx && ctx->pctx->merge)

                        ctx->pctx->section = s;
        }
 
                        ctx->pctx->section = s;
        }