lua: include /opt/local/lib and /opt/local/include in the search path on mac os x

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index c683dd2..cf6d970 100644 (file)
--- a/list.c
+++ b/list.c
@@ -9,7 +9,7 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  */
 
 static void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
@@ -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)
@@ -358,6 +359,18 @@ done:
 }
 
 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)
 {
        struct uci_element *e;
@@ -371,7 +384,11 @@ uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool ext
        ptr->flags |= UCI_LOOKUP_DONE;
 
        /* look up the package first */
-       e = uci_lookup_list(&ctx->root, ptr->package);
+       if (ptr->p)
+               e = &ptr->p->e;
+       else
+               e = uci_lookup_list(&ctx->root, ptr->package);
+
        if (!e) {
                UCI_INTERNAL(uci_load, ctx, ptr->package, &ptr->p);
                if (!ptr->p)
@@ -382,12 +399,14 @@ uci_lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool ext
                ptr->last = e;
        }
 
-       if (!ptr->section)
+       if (!ptr->section && !ptr->s)
                goto complete;
 
        /* if the section name validates as a regular name, pass through
         * to the regular uci_lookup function call */
-       if (ptr->flags & UCI_LOOKUP_EXTENDED) {
+       if (ptr->s) {
+               e = &ptr->s->e;
+       } else if (ptr->flags & UCI_LOOKUP_EXTENDED) {
                if (extended)
                        e = uci_lookup_ext_section(ctx, ptr);
                else
@@ -466,7 +485,7 @@ static void uci_add_element_list(struct uci_context *ctx, struct uci_ptr *ptr, b
 int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 {
        /* NB: UCI_INTERNAL use means without delta tracking */
-       bool internal = ctx->internal;
+       bool internal = ctx && ctx->internal;
        struct uci_element *e;
        struct uci_package *p;
        char *n;
@@ -511,7 +530,7 @@ int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
 
 int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res)
 {
-       bool internal = ctx->internal;
+       bool internal = ctx && ctx->internal;
        struct uci_section *s;
 
        UCI_HANDLE_ERR(ctx);
@@ -528,7 +547,7 @@ int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *
 int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 {
        /* NB: pass on internal flag to uci_del_element */
-       bool internal = ctx->internal;
+       bool internal = ctx && ctx->internal;
        struct uci_package *p;
        struct uci_element *e;
 
@@ -555,7 +574,7 @@ int uci_delete(struct uci_context *ctx, struct uci_ptr *ptr)
 int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
 {
        /* NB: UCI_INTERNAL use means without delta tracking */
-       bool internal = ctx->internal;
+       bool internal = ctx && ctx->internal;
        struct uci_option *prev = NULL;
        const char *value2 = NULL;
 
@@ -596,7 +615,7 @@ int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
 int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
 {
        /* NB: UCI_INTERNAL use means without delta tracking */
-       bool internal = ctx->internal;
+       bool internal = ctx && ctx->internal;
 
        UCI_HANDLE_ERR(ctx);
        uci_expand_ptr(ctx, ptr, false);