Merge remote branch 'uci_upstream_remote/master' into uci_upstream_merge

[uci.git] / list.c

diff --git a/list.c b/list.c
index 99179712e8b88c6b567ca04e1b9046edcd8b3b33..31ee551409d34bdb319ddb3234483ad2e5f1ba25 100644 (file)
--- a/list.c
+++ b/list.c
@@ -19,11 +19,12 @@ static void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int po
 
        uci_list_del(ptr);
        uci_foreach_element(head, p) {
-               new_head = &p->list;
                if (pos-- <= 0)
                        break;
+               new_head = &p->list;
        }
-       uci_list_add(new_head, ptr);
+
+       uci_list_add(new_head->next, ptr);
 }
 
 static inline void uci_list_fixup(struct uci_list *ptr)
@@ -72,8 +73,7 @@ uci_free_element(struct uci_element *e)
        free(e);
 }
 
-static struct uci_option *
-uci_alloc_option(struct uci_section *s, const char *name, const char *value)
+struct uci_option *uci_alloc_option(struct uci_section *s, const char *name, const char *value)
 {
        struct uci_package *p = s->package;
        struct uci_context *ctx = p->ctx;
@@ -357,6 +357,18 @@ done:
        return e;
 }
 
+int
+uci_lookup_next(struct uci_context *ctx, struct uci_element **e, struct uci_list *list, const char *name)
+{
+       UCI_HANDLE_ERR(ctx);
+
+       *e = uci_lookup_list(list, name);
+       if (!*e)
+               UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+
+       return 0;
+}
+
 int
 uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool extended)
 {
@@ -531,6 +543,22 @@ int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *
        return 0;
 }
 
+int uci_add_named_section(struct uci_context *ctx, struct uci_package *p, const char *type, const char *name, 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, name);
+       uci_fixup_section(ctx, s);
+       *res = s;
+       if (!internal && p->has_delta)
+               uci_add_delta(ctx, &p->delta, UCI_CMD_ADD, s->e.name, NULL, type);
+
+       return 0;
+}
+
 int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 {
        /* NB: pass on internal flag to uci_del_element */