X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=faf4494ea512bafd4018eff824a6cdb3f5eca1a4;hp=a336b84aff7569223d1ec1c9546506df9aa7c5e7;hb=160a9e13133aee87d8efcc838a2157073d5616d3;hpb=fcb93b2ca79dbddd7a8754f65d72b78c4d6c13b5

diff --git a/list.c b/list.c
index a336b84..faf4494 100644
--- 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)
@@ -32,7 +33,7 @@ static inline void uci_list_fixup(struct uci_list *ptr)
 	ptr->next->prev = ptr;
 }
 
-/* 
+/*
  * uci_alloc_generic allocates a new uci_element with payload
  * payload is appended to the struct to save memory and reduce fragmentation
  */
@@ -65,8 +66,7 @@ done:
 __private void
 uci_free_element(struct uci_element *e)
 {
-	if (e->name)
-		free(e->name);
+	free(e->name);
 	if (!uci_list_empty(&e->list))
 		uci_list_del(&e->list);
 	free(e);
@@ -216,7 +216,7 @@ uci_free_section(struct uci_section *s)
 	uci_free_element(&s->e);
 }
 
-__plugin struct uci_package *
+__private struct uci_package *
 uci_alloc_package(struct uci_context *ctx, const char *name)
 {
 	struct uci_package *p;
@@ -238,8 +238,7 @@ uci_free_package(struct uci_package **package)
 	if(!p)
 		return;
 
-	if (p->path)
-		free(p->path);
+	free(p->path);
 	uci_foreach_element_safe(&p->sections, tmp, e) {
 		uci_free_section(uci_to_section(e));
 	}
@@ -319,7 +318,7 @@ uci_lookup_ext_section(struct uci_context *ctx, struct uci_ptr *ptr)
 	else if (!uci_validate_type(name))
 		goto error;
 
-	/* if the given index is negative, it specifies the section number from 
+	/* if the given index is negative, it specifies the section number from
 	 * the end of the list */
 	if (idx < 0) {
 		c = 0;
@@ -484,7 +483,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;
@@ -501,8 +500,7 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 		uci_add_delta(ctx, &p->delta, UCI_CMD_RENAME, ptr->section, ptr->option, ptr->value);
 
 	n = uci_strdup(ctx, ptr->value);
-	if (e->name)
-		free(e->name);
+	free(e->name);
 	e->name = n;
 
 	if (e->type == UCI_TYPE_SECTION)
@@ -514,12 +512,13 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
 {
 	struct uci_package *p = s->package;
+	bool internal = ctx && ctx->internal;
 	char order[32];
 
 	UCI_HANDLE_ERR(ctx);
 
 	uci_list_set_pos(&s->package->sections, &s->e.list, pos);
-	if (!ctx->internal && p->has_delta) {
+	if (!internal && p->has_delta) {
 		sprintf(order, "%d", pos);
 		uci_add_delta(ctx, &p->delta, UCI_CMD_REORDER, s->e.name, NULL, order);
 	}
@@ -529,7 +528,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);
@@ -546,21 +545,39 @@ 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;
+	struct uci_element *e1, *e2, *tmp;
+	int index;
 
 	UCI_HANDLE_ERR(ctx);
 
-	e = uci_expand_ptr(ctx, ptr, true);
+	e1 = uci_expand_ptr(ctx, ptr, true);
 	p = ptr->p;
 
 	UCI_ASSERT(ctx, ptr->s);
 
+	if (ptr->o && ptr->o->type == UCI_TYPE_LIST && ptr->value && *ptr->value) {
+		if (!sscanf(ptr->value, "%d", &index))
+			return 1;
+
+		uci_foreach_element_safe(&ptr->o->v.list, tmp, e2) {
+			if (index == 0) {
+				if (!internal && p->has_delta)
+					uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, ptr->value);
+				uci_free_option(uci_to_option(e2));
+				return 0;
+			}
+			index--;
+		}
+
+		return 0;
+	}
+
 	if (!internal && p->has_delta)
 		uci_add_delta(ctx, &p->delta, UCI_CMD_REMOVE, ptr->section, ptr->option, NULL);
 
-	uci_free_any(&e);
+	uci_free_any(&e1);
 
 	if (ptr->option)
 		ptr->o = NULL;
@@ -573,7 +590,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;
 
@@ -611,10 +628,42 @@ int uci_add_list(struct uci_context *ctx, struct uci_ptr *ptr)
 	return 0;
 }
 
+int uci_del_list(struct uci_context *ctx, struct uci_ptr *ptr)
+{
+	/* NB: pass on internal flag to uci_del_element */
+	bool internal = ctx && ctx->internal;
+	struct uci_element *e, *tmp;
+	struct uci_package *p;
+
+	UCI_HANDLE_ERR(ctx);
+
+	uci_expand_ptr(ctx, ptr, false);
+	UCI_ASSERT(ctx, ptr->s);
+	UCI_ASSERT(ctx, ptr->value);
+
+	if (!(ptr->o && ptr->option))
+		return 0;
+
+	if ((ptr->o->type != UCI_TYPE_LIST))
+		return 0;
+
+	p = ptr->p;
+	if (!internal && p->has_delta)
+		uci_add_delta(ctx, &p->delta, UCI_CMD_LIST_DEL, ptr->section, ptr->option, ptr->value);
+
+	uci_foreach_element_safe(&ptr->o->v.list, tmp, e) {
+		if (!strcmp(ptr->value, uci_to_option(e)->e.name)) {
+			uci_free_option(uci_to_option(e));
+		}
+	}
+
+	return 0;
+}
+
 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);