X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=list.c;h=0924edfc173df808404a98fad148c43905611b21;hb=cac9b1d765338466c1c77719c4119c565689b4c4;hp=e817118472f06db1ef3476b88d93ba3ab8f18881;hpb=14654223268133b5e74ee1748cec2374664ac5bf;p=project%2Fuci.git

diff --git a/list.c b/list.c
index e817118..0924edf 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;
@@ -98,9 +98,10 @@ uci_alloc_option(struct uci_section *s, const char *name, const char *value)
 	struct uci_option *o;
 
 	o = uci_alloc_element(ctx, option, name, strlen(value) + 1);
-	o->value = uci_dataptr(o);
+	o->type = UCI_TYPE_STRING;
+	o->v.string = uci_dataptr(o);
 	o->section = s;
-	strcpy(o->value, value);
+	strcpy(o->v.string, value);
 	uci_list_add(&s->options, &o->e.list);
 
 	return o;
@@ -109,12 +110,54 @@ uci_alloc_option(struct uci_section *s, const char *name, const char *value)
 static inline void
 uci_free_option(struct uci_option *o)
 {
-	if ((o->value != uci_dataptr(o)) &&
-		(o->value != NULL))
-		free(o->value);
+	switch(o->type) {
+	case UCI_TYPE_STRING:
+		if ((o->v.string != uci_dataptr(o)) &&
+			(o->v.string != NULL))
+			free(o->v.string);
+		break;
+	default:
+		break;
+	}
 	uci_free_element(&o->e);
 }
 
+/* fix up an unnamed section, e.g. after adding options to it */
+static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
+{
+	unsigned int hash = ~0;
+	struct uci_element *e;
+	char buf[16];
+
+	if (!s || s->e.name)
+		return;
+
+	/*
+	 * Generate a name for unnamed sections. This is used as reference
+	 * when locating or updating the section from apps/scripts.
+	 * To make multiple concurrent versions somewhat safe for updating,
+	 * the name is generated from a hash of its type and name/value
+	 * pairs of its option, and it is prefixed by a counter value.
+	 * If the order of the unnamed sections changes for some reason,
+	 * updates to them will be rejected.
+	 */
+	hash = djbhash(hash, s->type);
+	uci_foreach_element(&s->options, e) {
+		struct uci_option *o;
+		hash = djbhash(hash, e->name);
+		o = uci_to_option(e);
+		switch(o->type) {
+		case UCI_TYPE_STRING:
+			hash = djbhash(hash, o->v.string);
+			break;
+		default:
+			break;
+		}
+	}
+	sprintf(buf, "cfg%02x%04x", ++s->package->n_section, hash % (1 << 16));
+	s->e.name = uci_strdup(ctx, buf);
+}
+
 static struct uci_section *
 uci_alloc_section(struct uci_package *p, const char *type, const char *name)
 {
@@ -131,6 +174,7 @@ uci_alloc_section(struct uci_package *p, const char *type, const char *name)
 	strcpy(s->type, type);
 	if (name == NULL)
 		s->anonymous = true;
+	p->n_section++;
 
 	uci_list_add(&p->sections, &s->e.list);
 
@@ -151,7 +195,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;
@@ -188,7 +232,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;
 
@@ -199,7 +243,116 @@ 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_ext(struct uci_context *ctx, struct uci_element **res, char *ptr)
+{
+	struct uci_package *p = NULL;
+	struct uci_element *e;
+	struct uci_section *s;
+	char *package = NULL;
+	char *section = NULL;
+	char *option = NULL;
+	char *idxstr, *t;
+	int idx, c;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, res != NULL);
+	UCI_ASSERT(ctx, ptr != NULL);
+
+	UCI_INTERNAL(uci_parse_tuple, ctx, ptr, &package, &section, &option, NULL);
+
+	/* look up the package first */
+	e = uci_lookup_list(&ctx->root, package);
+	if (!e) {
+		UCI_INTERNAL(uci_load, ctx, package, &p);
+		if (!p)
+			goto notfound;
+		e = &p->e;
+	} else {
+		p = uci_to_package(e);
+	}
+
+	if (!section)
+		goto done;
+
+	/* if the section name validates as a regular name, pass through
+	 * to the regular uci_lookup function call */
+	if (!*section || uci_validate_name(section)) {
+		UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
+		goto done;
+	}
+
+	/* name did not validate, that means we have an extended lookup call
+	 * parse it here. for now only the section index syntax is supported */
+	if (section[0] != '@')
+		goto error;
+
+	section++;
+
+	/* parse the section index part */
+	idxstr = strchr(section, '[');
+	if (!idxstr)
+		goto error;
+	*idxstr = 0;
+	idxstr++;
+
+	t = strchr(idxstr, ']');
+	if (!t)
+		goto error;
+	if (t[1] != 0)
+		goto error;
+	*t = 0;
+
+	t = NULL;
+	idx = strtol(idxstr, &t, 10);
+	if (t && *t)
+		goto error;
+
+	if (!*section)
+		section = NULL;
+	if (section && !uci_validate_str(section, false))
+		goto error;
+
+	/* if the given index is negative, it specifies the section number from 
+	 * the end of the list */
+	if (idx < 0) {
+		c = 0;
+		uci_foreach_element(&p->sections, e) {
+			s = uci_to_section(e);
+			if (section && (strcmp(s->type, section) != 0))
+				continue;
+
+			c++;
+		}
+		idx += c;
+	}
+
+	c = 0;
+	uci_foreach_element(&p->sections, e) {
+		s = uci_to_section(e);
+		if (section && (strcmp(s->type, section) != 0))
+			continue;
+
+		if (idx == c)
+			goto found;
+		c++;
+	}
+	goto notfound;
+
+found:
+	if (option)
+		e = uci_lookup_list(&s->options, option);
+done:
+	*res = e;
+	return 0;
+
+notfound:
+	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+error:
+	UCI_THROW(ctx, UCI_ERR_INVAL);
+	return 0;
+}
+
+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;
@@ -207,17 +360,19 @@ 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;
 	}
 
 	*res = e;
@@ -260,7 +415,7 @@ int uci_del_element(struct uci_context *ctx, struct uci_element *e)
 	}
 
 	p = s->package;
-	if (!internal && p->confdir)
+	if (!internal && p->has_history)
 		uci_add_history(ctx, &p->history, UCI_CMD_REMOVE, s->e.name, option, NULL);
 
 	switch(e->type) {
@@ -276,7 +431,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;
@@ -284,6 +439,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;
@@ -310,20 +466,29 @@ 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;
+		if (o->type != UCI_TYPE_STRING)
+			UCI_THROW(ctx, UCI_ERR_INVAL);
+		/* matches the currently set value */
+		if (!strcmp(value, o->v.string))
+			return 0;
 		break;
 	default:
 		UCI_THROW(ctx, UCI_ERR_INVAL);
 		return 0;
 	}
 	p = s->package;
-	if (!internal && p->confdir)
+	if (!internal && p->has_history)
 		uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, section, option, value);
 
 	uci_list_del(&e->list);
@@ -337,7 +502,7 @@ int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
 		uci_to_section(e)->type = str;
 		break;
 	case UCI_TYPE_OPTION:
-		uci_to_option(e)->value = str;
+		uci_to_option(e)->v.string = str;
 		break;
 	default:
 		break;
@@ -357,7 +522,7 @@ 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 && p->confdir)
+	if (!internal && p->has_history)
 		uci_add_history(ctx, &p->history, UCI_CMD_RENAME, section, option, name);
 
 	name = uci_strdup(ctx, name);
@@ -368,8 +533,23 @@ 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, const char *type, struct uci_section **res)
+{
+	bool internal = ctx->internal;
+	struct uci_section *s;
 
-int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, p != NULL);
+	s = uci_alloc_section(p, type, NULL);
+	uci_fixup_section(ctx, s);
+	*res = s;
+	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, const char *section, const char *option)
 {
 	/* NB: pass on internal flag to uci_del_element */
 	bool internal = ctx->internal;
@@ -384,7 +564,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, 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;
@@ -407,7 +587,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;
 
@@ -416,7 +596,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);
@@ -430,9 +610,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:
 	/* 
@@ -445,12 +629,16 @@ notfound:
 		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
 	/* now add the missing entry */
-	if (!internal && p->confdir)
-		uci_add_history(ctx, &p->history, UCI_CMD_ADD, section, option, value);
-	if (s)
-		uci_alloc_option(s, option, value);
-	else {
+	if (!internal && p->has_history)
+		uci_add_history(ctx, &p->history, UCI_CMD_CHANGE, 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 (result)
+			*result = &s->e;
 		if (ctx->pctx && ctx->pctx->merge)
 			ctx->pctx->section = s;
 	}