X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=c6b7ebc87743e12f2bb499ac93050461a3c0c5a1;hp=502f51f216cd3debaa9e83eb1a8969af71247491;hb=5620bfaa14ce556b94de26128bc7fe9edc5a3f27;hpb=f2520c27cd7942dc01d3386b4083b128648343c0

diff --git a/list.c b/list.c
index 502f51f..c6b7ebc 100644
--- a/list.c
+++ b/list.c
@@ -151,44 +151,6 @@ uci_free_section(struct uci_section *s)
 	uci_free_element(&s->e);
 }
 
-/* record a change that was done to a package */
-static void
-uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
-{
-	struct uci_history *h;
-	int size = strlen(section) + 1;
-	char *ptr;
-
-	if (!p->confdir)
-		return;
-
-	if (value)
-		size += strlen(section) + 1;
-
-	h = uci_alloc_element(ctx, history, option, size);
-	ptr = uci_dataptr(h);
-	h->cmd = cmd;
-	h->section = strcpy(ptr, section);
-	if (value) {
-		ptr += strlen(ptr) + 1;
-		h->value = strcpy(ptr, value);
-	}
-	uci_list_add(&p->history, &h->e.list);
-}
-
-static void
-uci_free_history(struct uci_history *h)
-{
-	if (!h)
-		return;
-	if ((h->section != NULL) &&
-		(h->section != uci_dataptr(h))) {
-		free(h->section);
-		free(h->value);
-	}
-	uci_free_element(&h->e);
-}
-
 static struct uci_package *
 uci_alloc_package(struct uci_context *ctx, const char *name)
 {
@@ -198,6 +160,7 @@ uci_alloc_package(struct uci_context *ctx, const char *name)
 	p->ctx = ctx;
 	uci_list_init(&p->sections);
 	uci_list_init(&p->history);
+	uci_list_init(&p->saved_history);
 	return p;
 }
 
@@ -218,6 +181,9 @@ uci_free_package(struct uci_package **package)
 	uci_foreach_element_safe(&p->history, tmp, e) {
 		uci_free_history(uci_to_history(e));
 	}
+	uci_foreach_element_safe(&p->saved_history, tmp, e) {
+		uci_free_history(uci_to_history(e));
+	}
 	uci_free_element(&p->e);
 	*package = NULL;
 }
@@ -252,6 +218,8 @@ int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_pac
 	if (option) {
 		s = uci_to_section(e);
 		e = uci_lookup_list(ctx, &s->options, option);
+		if (!e)
+			goto notfound;
 	}
 
 	*res = e;
@@ -294,8 +262,8 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e)
 	}
 
 	p = s->package;
-	if (!internal)
-		uci_add_history(ctx, p, UCI_CMD_REMOVE, s->e.name, option, NULL);
+	if (!internal && p->confdir)
+		uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, s->e.name, option, NULL);
 
 	switch(e->type) {
 	case UCI_TYPE_SECTION:
@@ -339,7 +307,7 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
 	list = e->list.prev;
 	switch(e->type) {
 	case UCI_TYPE_SECTION:
-		UCI_ASSERT(ctx, uci_validate_name(value));
+		UCI_ASSERT(ctx, uci_validate_str(value, false));
 		size = sizeof(struct uci_section);
 		s = uci_to_section(e);
 		section = e->name;
@@ -357,8 +325,8 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
 		return 0;
 	}
 	p = s->package;
-	if (!internal)
-		uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
+	if (!internal && p->confdir)
+		uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
 
 	uci_list_del(&e->list);
 	e = uci_realloc(ctx, e, size);
@@ -391,8 +359,8 @@ int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, ch
 	/* NB: p, section, option validated by uci_lookup */
 	UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
 
-	if (!internal)
-		uci_add_history(ctx, p, UCI_CMD_RENAME, section, option, name);
+	if (!internal && p->confdir)
+		uci_add_history(ctx, &p->history, UCI_CMD_RENAME, section, option, name);
 
 	name = uci_strdup(ctx, name);
 	if (e->name)
@@ -418,7 +386,7 @@ int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, ch
 	return uci_del_element(ctx, e);
 }
 
-int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value)
+int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value, struct uci_element **result)
 {
 	/* NB: UCI_INTERNAL use means without history tracking */
 	bool internal = ctx->internal;
@@ -433,7 +401,7 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
 		UCI_ASSERT(ctx, uci_validate_name(option));
 		UCI_ASSERT(ctx, value != NULL);
 	} else {
-		UCI_ASSERT(ctx, uci_validate_name(value));
+		UCI_ASSERT(ctx, uci_validate_str(value, false));
 	}
 
 	/*
@@ -446,7 +414,7 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
 		goto notfound;
 
 	s = uci_to_section(e);
-	if (ctx->pctx)
+	if (ctx->pctx && ctx->pctx->merge)
 		ctx->pctx->section = s;
 
 	if (option) {
@@ -464,9 +432,13 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
 		e = &o->e;
 	else
 		e = &s->e;
+	if (result)
+		*result = e;
+	else
+		result = &e;
 
 	ctx->internal = internal;
-	return uci_set_element_value(ctx, &e, value);
+	return uci_set_element_value(ctx, result, value);
 
 notfound:
 	/* 
@@ -479,13 +451,17 @@ notfound:
 		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
 	/* now add the missing entry */
-	if (!internal)
-		uci_add_history(ctx, p, UCI_CMD_ADD, section, option, value);
-	if (s)
-		uci_alloc_option(s, option, value);
-	else {
+	if (!internal && p->confdir)
+		uci_add_history(ctx, &p->history, UCI_CMD_ADD, section, option, value);
+	if (s) {
+		o = uci_alloc_option(s, option, value);
+		if (result)
+			*result = &o->e;
+	} else {
 		s = uci_alloc_section(p, value, section);
-		if (ctx->pctx)
+		if (result)
+			*result = &s->e;
+		if (ctx->pctx && ctx->pctx->merge)
 			ctx->pctx->section = s;
 	}