X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=8f30db7563bc328989df9de148feb925d8f3ff14;hp=334bc324d7584f41f972431329ec6c9df573dd6d;hb=865b3fb435c6896498bd6174e5ee4ea605a963fd;hpb=01ca9e5e467e4f324f52fd80a2ec4db999b3db48

diff --git a/list.c b/list.c
index 334bc32..8f30db7 100644
--- a/list.c
+++ b/list.c
@@ -61,23 +61,30 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 	int datalen = size;
 	void *ptr;
 
-	if (name)
-		datalen += strlen(name) + 1;
 	ptr = uci_malloc(ctx, datalen);
 	e = (struct uci_element *) ptr;
 	e->type = type;
 	if (name) {
-		e->name = (char *) ptr + size;
-		strcpy(e->name, name);
+		UCI_TRAP_SAVE(ctx, error);
+		e->name = uci_strdup(ctx, name);
+		UCI_TRAP_RESTORE(ctx);
 	}
 	uci_list_init(&e->list);
+	goto done;
 
+error:
+	free(ptr);
+	UCI_THROW(ctx, ctx->errno);
+
+done:
 	return e;
 }
 
 static void
 uci_free_element(struct uci_element *e)
 {
+	if (e->name)
+		free(e->name);
 	if (!uci_list_empty(&e->list))
 		uci_list_del(&e->list);
 	free(e);
@@ -113,18 +120,18 @@ uci_alloc_section(struct uci_package *p, const char *type, const char *name)
 {
 	struct uci_context *ctx = p->ctx;
 	struct uci_section *s;
-	char buf[16];
 
-	if (!name || !name[0]) {
-		snprintf(buf, 16, "cfg%d", p->n_section);
-		name = buf;
-	}
+	if (name && !name[0])
+		name = NULL;
 
 	s = uci_alloc_element(ctx, section, name, strlen(type) + 1);
+	uci_list_init(&s->options);
 	s->type = uci_dataptr(s);
 	s->package = p;
 	strcpy(s->type, type);
-	uci_list_init(&s->options);
+	if (name == NULL)
+		s->anonymous = true;
+
 	uci_list_add(&p->sections, &s->e.list);
 
 	return s;
@@ -195,9 +202,10 @@ uci_alloc_package(struct uci_context *ctx, const char *name)
 }
 
 static void
-uci_free_package(struct uci_package *p)
+uci_free_package(struct uci_package **package)
 {
 	struct uci_element *e, *tmp;
+	struct uci_package *p = *package;
 
 	if(!p)
 		return;
@@ -211,6 +219,7 @@ uci_free_package(struct uci_package *p)
 		uci_free_history(uci_to_history(e));
 	}
 	uci_free_element(&p->e);
+	*package = NULL;
 }
 
 static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
@@ -370,7 +379,33 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
 	return 0;
 }
 
-int uci_del(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
+int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *name)
+{
+	/* NB: UCI_INTERNAL use means without history tracking */
+	bool internal = ctx->internal;
+	struct uci_element *e;
+	struct uci_section *s = NULL;
+	struct uci_option *o = NULL;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, p != NULL);
+	UCI_ASSERT(ctx, section != NULL);
+
+	UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
+
+	if (!internal)
+		uci_add_history(ctx, p, UCI_CMD_RENAME, section, option, name);
+
+	name = uci_strdup(ctx, name);
+	if (e->name)
+		free(e->name);
+	e->name = name;
+
+	return 0;
+}
+
+
+int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
 {
 	/* NB: pass on internal flag to uci_del_element */
 	bool internal = ctx->internal;
@@ -410,8 +445,14 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
 	 * if the section/option is to be modified and it is not found
 	 * create a new element in the appropriate list
 	 */
-	UCI_INTERNAL(uci_lookup, ctx, &e, p, section, NULL);
+	e = uci_lookup_list(ctx, &p->sections, section);
+	if (!e)
+		goto notfound;
+
 	s = uci_to_section(e);
+	if (ctx->pctx)
+		ctx->pctx->section = s;
+
 	if (option) {
 		e = uci_lookup_list(ctx, &s->options, option);
 		if (!e)
@@ -449,8 +490,11 @@ notfound:
 		uci_add_history(ctx, p, UCI_CMD_ADD, section, option, value);
 	if (s)
 		uci_alloc_option(s, option, value);
-	else
-		uci_alloc_section(p, value, section);
+	else {
+		s = uci_alloc_section(p, value, section);
+		if (ctx->pctx)
+			ctx->pctx->section = s;
+	}
 
 	return 0;
 }
@@ -462,7 +506,7 @@ int uci_unload(struct uci_context *ctx, struct uci_package *p)
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, p != NULL);
 
-	uci_free_package(p);
+	uci_free_package(&p);
 	return 0;
 }