fix a few bugs found during code review

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index 3fc6076..a0d50d1 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>
  *
- * 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
@@ -163,7 +163,7 @@ uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *s
                return;
 
        if (value)
-               size += strlen(section) + 1;
+               size += strlen(value) + 1;
 
        h = uci_alloc_element(ctx, history, option, size);
        ptr = uci_dataptr(h);
@@ -414,11 +414,8 @@ int uci_delete(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)
-               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)
@@ -449,7 +446,7 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
                goto notfound;
 
        s = uci_to_section(e);
-       if (ctx->pctx)
+       if (ctx->pctx && ctx->pctx->merge)
                ctx->pctx->section = s;
 
        if (option) {
@@ -468,11 +465,8 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
        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:
        /* 
@@ -491,7 +485,7 @@ notfound:
                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;
        }