X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=b20ee712308ecdcc26db0caae67e264b2177e2f3;hp=aabcab0582a0d0dc14fa6016b452237b75fbae4d;hb=a05278ae05df910e6a3a450d862fc1b53f138eb7;hpb=7ca5c675d7dc21fa7767b64a42a1705bb800fc86

diff --git a/list.c b/list.c
index aabcab0..b20ee71 100644
--- a/list.c
+++ b/list.c
@@ -74,7 +74,7 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 
 error:
 	free(ptr);
-	UCI_THROW(ctx, ctx->errno);
+	UCI_THROW(ctx, ctx->err);
 
 done:
 	return e;
@@ -180,7 +180,7 @@ uci_free_section(struct uci_section *s)
 	uci_free_element(&s->e);
 }
 
-static struct uci_package *
+__plugin struct uci_package *
 uci_alloc_package(struct uci_context *ctx, const char *name)
 {
 	struct uci_package *p;
@@ -217,7 +217,7 @@ uci_free_package(struct uci_package **package)
 	*package = NULL;
 }
 
-static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
+static struct uci_element *uci_lookup_list(struct uci_list *list, const char *name)
 {
 	struct uci_element *e;
 
@@ -228,7 +228,7 @@ static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_l
 	return NULL;
 }
 
-int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, const char *section, const char *option)
 {
 	struct uci_element *e;
 	struct uci_section *s;
@@ -236,17 +236,17 @@ int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_pac
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, res != NULL);
 	UCI_ASSERT(ctx, p != NULL);
-	UCI_ASSERT(ctx, uci_validate_name(section));
+	UCI_ASSERT(ctx, section && uci_validate_name(section));
 	if (option)
 		UCI_ASSERT(ctx, uci_validate_name(option));
 
-	e = uci_lookup_list(ctx, &p->sections, section);
+	e = uci_lookup_list(&p->sections, section);
 	if (!e)
 		goto notfound;
 
 	if (option) {
 		s = uci_to_section(e);
-		e = uci_lookup_list(ctx, &s->options, option);
+		e = uci_lookup_list(&s->options, option);
 		if (!e)
 			goto notfound;
 	}
@@ -307,7 +307,7 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e)
 	return 0;
 }
 
-int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
+int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, const char *value)
 {
 	/* NB: UCI_INTERNAL use means without history tracking */
 	bool internal = ctx->internal;
@@ -315,6 +315,7 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
 	struct uci_element *e;
 	struct uci_package *p;
 	struct uci_section *s;
+	struct uci_option *o;
 	char *section;
 	char *option;
 	char *str;
@@ -341,13 +342,20 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
 		s = uci_to_section(e);
 		section = e->name;
 		option = NULL;
+		/* matches the currently set value */
+		if (!strcmp(value, s->type))
+			return 0;
 		break;
 	case UCI_TYPE_OPTION:
 		UCI_ASSERT(ctx, value != NULL);
 		size = sizeof(struct uci_option);
-		s = uci_to_option(e)->section;
+		o = uci_to_option(e);
+		s = o->section;
 		section = s->e.name;
-		option = e->name;
+		option = o->e.name;
+		/* matches the currently set value */
+		if (!strcmp(value, o->value))
+			return 0;
 		break;
 	default:
 		UCI_THROW(ctx, UCI_ERR_INVAL);
@@ -399,8 +407,9 @@ int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, ch
 	return 0;
 }
 
-int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type, struct uci_section **res)
+int uci_add_section(struct uci_context *ctx, struct uci_package *p, const char *type, struct uci_section **res)
 {
+	bool internal = ctx->internal;
 	struct uci_section *s;
 
 	UCI_HANDLE_ERR(ctx);
@@ -408,12 +417,13 @@ int uci_add_section(struct uci_context *ctx, struct uci_package *p, char *type,
 	s = uci_alloc_section(p, type, NULL);
 	uci_fixup_section(ctx, s);
 	*res = s;
-	uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
+	if (!internal && p->has_history)
+		uci_add_history(ctx, &p->history, UCI_CMD_ADD, s->e.name, NULL, type);
 
 	return 0;
 }
 
-int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
+int uci_delete(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option)
 {
 	/* NB: pass on internal flag to uci_del_element */
 	bool internal = ctx->internal;
@@ -428,7 +438,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, struct uci_element **result)
+int uci_set(struct uci_context *ctx, struct uci_package *p, const char *section, const char *option, const char *value, struct uci_element **result)
 {
 	/* NB: UCI_INTERNAL use means without history tracking */
 	bool internal = ctx->internal;
@@ -451,7 +461,7 @@ 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
 	 */
-	e = uci_lookup_list(ctx, &p->sections, section);
+	e = uci_lookup_list(&p->sections, section);
 	if (!e)
 		goto notfound;
 
@@ -460,7 +470,7 @@ int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
 		ctx->pctx->section = s;
 
 	if (option) {
-		e = uci_lookup_list(ctx, &s->options, option);
+		e = uci_lookup_list(&s->options, option);
 		if (!e)
 			goto notfound;
 		o = uci_to_option(e);