X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=cd995fee2ff931da9d55d40f882555dc4e48058f;hp=9486ffba17d1f9b871d3709921fb8e499bfd9dfe;hb=fa40c4e16644da1f7c87cbd5a25d3fa8be4e0594;hpb=00d91c8ca4a5d35d5c3706d0042f0e57cefa3d12

diff --git a/list.c b/list.c
index 9486ffb..cd995fe 100644
--- a/list.c
+++ b/list.c
@@ -48,6 +48,20 @@ static inline void uci_list_del(struct uci_list *ptr)
 	uci_list_init(ptr);
 }
 
+static inline void uci_list_set_pos(struct uci_list *head, struct uci_list *ptr, int pos)
+{
+	struct uci_list *new_head = head;
+	struct uci_element *p = NULL;
+
+	uci_list_del(ptr);
+	uci_foreach_element(head, p) {
+		new_head = &p->list;
+		if (pos-- <= 0)
+			break;
+	}
+	uci_list_add(new_head, ptr);
+}
+
 static inline void uci_list_fixup(struct uci_list *ptr)
 {
 	ptr->prev->next = ptr;
@@ -533,6 +547,22 @@ int uci_rename(struct uci_context *ctx, struct uci_ptr *ptr)
 	return 0;
 }
 
+int uci_reorder_section(struct uci_context *ctx, struct uci_section *s, int pos)
+{
+	struct uci_package *p = s->package;
+	char order[32];
+
+	UCI_HANDLE_ERR(ctx);
+
+	uci_list_set_pos(&s->package->sections, &s->e.list, pos);
+	if (!ctx->internal && p->has_history) {
+		sprintf(order, "%d", pos);
+		uci_add_history(ctx, &p->history, UCI_CMD_REORDER, s->e.name, NULL, order);
+	}
+
+	return 0;
+}
+
 int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res)
 {
 	bool internal = ctx->internal;
@@ -626,7 +656,7 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
 	expand_ptr(ctx, ptr, false);
 	UCI_ASSERT(ctx, ptr->value);
 	UCI_ASSERT(ctx, ptr->s || (!ptr->option && ptr->section));
-	if (!ptr->option) {
+	if (!ptr->option && ptr->value[0]) {
 		UCI_ASSERT(ctx, uci_validate_type(ptr->value));
 	}
 
@@ -636,7 +666,14 @@ int uci_set(struct uci_context *ctx, struct uci_ptr *ptr)
 		if (e)
 			ptr->o = uci_to_option(e);
 	}
-	if (!ptr->o && ptr->option) { /* new option */
+	if (!ptr->value[0]) {
+		/* if setting a nonexistant option/section to a nonexistant value,
+		 * exit without errors */
+		if (!(ptr->flags & UCI_LOOKUP_COMPLETE))
+			return 0;
+
+		return uci_delete(ctx, ptr);
+	} else if (!ptr->o && ptr->option) { /* new option */
 		ptr->o = uci_alloc_option(ptr->s, ptr->option, ptr->value);
 		ptr->last = &ptr->o->e;
 	} else if (!ptr->s && ptr->section) { /* new section */