X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=e89633e3486bae09688f72bef1afa4ffe25ce112;hp=666989af8e56b2091196d7973051504ccd08704a;hb=d2c85b2804aaa22e539e266b5ed4cf958d6ceb35;hpb=c9125084e1e28b8f1907b2ca5c5f9d69a538425f

diff --git a/list.c b/list.c
index 666989a..e89633e 100644
--- a/list.c
+++ b/list.c
@@ -21,7 +21,7 @@ static inline void uci_list_init(struct uci_list *ptr)
 	ptr->next = ptr;
 }
 
-/* inserts a new list entry between two consecutive entries */
+/* inserts a new list entry after a given entry */
 static inline void uci_list_insert(struct uci_list *list, struct uci_list *ptr)
 {
 	list->next->prev = ptr;
@@ -50,6 +50,10 @@ static inline void uci_list_del(struct uci_list *ptr)
 	uci_list_init(ptr);
 }
 
+/* 
+ * uci_alloc_generic allocates a new uci_element with payload
+ * payload is appended to the struct to save memory and reduce fragmentation
+ */
 static struct uci_element *
 uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 {
@@ -69,9 +73,6 @@ uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
 static void
 uci_free_element(struct uci_element *e)
 {
-	if (!e)
-		return;
-
 	if (!uci_list_empty(&e->list))
 		uci_list_del(&e->list);
 	free(e);
@@ -140,6 +141,7 @@ uci_alloc_package(struct uci_context *ctx, const char *name)
 	p = uci_alloc_element(ctx, package, name, 0);
 	p->ctx = ctx;
 	uci_list_init(&p->sections);
+	uci_list_init(&p->history);
 	return p;
 }
 
@@ -151,13 +153,30 @@ uci_free_package(struct uci_package *p)
 	if(!p)
 		return;
 
+	if (p->path)
+		free(p->path);
 	uci_foreach_element_safe(&p->sections, tmp, e) {
 		uci_free_section(uci_to_section(e));
 	}
 	uci_free_element(&p->e);
 }
 
-static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, char *name)
+/* record a change that was done to a package */
+static inline void
+uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *section, char *option, char *value)
+{
+	struct uci_history *h = (struct uci_history *) uci_malloc(ctx, sizeof(struct uci_history));
+
+	uci_list_init(&h->list);
+	h->cmd = cmd;
+	h->section = section;
+	h->option = option;
+	h->value = value;
+	uci_list_add(&p->history, &h->list);
+}
+
+
+static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
 {
 	struct uci_element *e;
 
@@ -165,106 +184,166 @@ static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_l
 		if (!strcmp(e->name, name))
 			return e;
 	}
-	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	return NULL;
 }
 
-int uci_lookup(struct uci_context *ctx, struct uci_element **res, char *package, char *section, char *option)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
 {
 	struct uci_element *e;
-	struct uci_package *p;
 	struct uci_section *s;
 	struct uci_option *o;
 
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, res != NULL);
-	UCI_ASSERT(ctx, package != NULL);
+	UCI_ASSERT(ctx, p != NULL);
+	UCI_ASSERT(ctx, section != NULL);
 
-	e = uci_lookup_list(ctx, &ctx->root, package);
-	if (!section)
-		goto found;
-
-	p = uci_to_package(e);
 	e = uci_lookup_list(ctx, &p->sections, section);
-	if (!option)
-		goto found;
+	if (!e)
+		goto notfound;
 
-	s = uci_to_section(e);
-	e = uci_lookup_list(ctx, &s->options, option);
+	if (option) {
+		s = uci_to_section(e);
+		e = uci_lookup_list(ctx, &s->options, option);
+	}
 
-found:
 	*res = e;
 	return 0;
+
+notfound:
+	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	return 0;
 }
 
-int uci_unload(struct uci_context *ctx, const char *name)
+int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
 {
+	int size;
+	char *str;
+	struct uci_list *list;
 	struct uci_element *e;
 
 	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, name != NULL);
-
-	uci_foreach_element(&ctx->root, e) {
-		if (!strcmp(e->name, name))
-			goto found;
+	UCI_ASSERT(ctx, value != NULL);
+	UCI_ASSERT(ctx, element != NULL);
+	UCI_ASSERT(ctx, *element != NULL);
+
+	/* what the 'value' of an element means depends on the type
+	 * for a section, the 'value' means its type
+	 * for an option, the 'value' means its value string
+	 * when changing the value, shrink the element to its actual size
+	 * (it may have been allocated with a bigger size, to include
+	 *  its buffer)
+	 * then duplicate the string passed on the command line and
+	 * insert it into the structure.
+	 */
+	e = *element;
+	list = e->list.prev;
+	switch(e->type) {
+	case UCI_TYPE_SECTION:
+		size = sizeof(struct uci_section);
+		break;
+	case UCI_TYPE_OPTION:
+		size = sizeof(struct uci_option);
+		break;
+	default:
+		UCI_THROW(ctx, UCI_ERR_INVAL);
+		break;
 	}
-	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
-found:
-	uci_free_package(uci_to_package(e));
+	uci_list_del(&e->list);
+	e = uci_realloc(ctx, e, size);
+	str = uci_strdup(ctx, value);
+	uci_list_insert(list, &e->list);
+	*element = e;
+
+	switch(e->type) {
+	case UCI_TYPE_SECTION:
+		uci_to_section(e)->type = value;
+		break;
+	case UCI_TYPE_OPTION:
+		uci_to_option(e)->value = value;
+		break;
+	default:
+		break;
+	}
 
 	return 0;
 }
 
-static inline char *get_filename(char *path)
-{
-	char *p;
-
-	p = strrchr(path, '/');
-	p++;
-	if (!*p)
-		return NULL;
-	return p;
-}
-
-char **uci_list_configs(struct uci_context *ctx)
+int uci_set(struct uci_context *ctx, char *package, char *section, char *option, char *value)
 {
-	char **configs;
-	glob_t globbuf;
-	int size, i;
-	char *buf;
+	struct uci_element *e;
+	struct uci_package *p = NULL;
+	struct uci_section *s = NULL;
+	struct uci_option *o = NULL;
+	struct uci_history *h;
 
-	if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
-		return NULL;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, package != NULL);
+	UCI_ASSERT(ctx, section != NULL);
 
-	size = sizeof(char *) * (globbuf.gl_pathc + 1);
-	for(i = 0; i < globbuf.gl_pathc; i++) {
-		char *p;
+	/*
+	 * look up the package, section and option (if set)
+	 * 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, &ctx->root, package);
+	if (!e)
+		goto notfound;
 
-		p = get_filename(globbuf.gl_pathv[i]);
-		if (!p)
-			continue;
+	p = uci_to_package(e);
+	e = uci_lookup_list(ctx, &p->sections, section);
+	if (!e)
+		goto notfound;
 
-		size += strlen(p) + 1;
+	s = uci_to_section(e);
+	if (option) {
+		e = uci_lookup_list(ctx, &s->options, option);
+		if (!e)
+			goto notfound;
+		o = uci_to_option(e);
 	}
 
-	configs = malloc(size);
-	if (!configs)
-		return NULL;
+	/* 
+	 * no unknown element was supplied, assume that we can just update 
+	 * an existing entry
+	 */
+	if (o)
+		e = &o->e;
+	else
+		e = &s->e;
+
+	uci_add_history(ctx, p, UCI_CMD_CHANGE, section, option, value);
+	return uci_set_element_value(ctx, &e, value);
+
+notfound:
+	/* 
+	 * the entry that we need to update was not found,
+	 * check if the search failed prematurely.
+	 * this can happen if the package was not found, or if
+	 * an option was supplied, but the section wasn't found
+	 */
+	if (!p || (!s && option))
+		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+
+	/* now add the missing entry */
+	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);
+
+	return 0;
+}
 
-	memset(configs, 0, size);
-	buf = (char *) &configs[globbuf.gl_pathc + 1];
-	for(i = 0; i < globbuf.gl_pathc; i++) {
-		char *p;
+int uci_unload(struct uci_context *ctx, struct uci_package *p)
+{
+	struct uci_element *e;
 
-		p = get_filename(globbuf.gl_pathv[i]);
-		if (!p)
-			continue;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, p != NULL);
 
-		configs[i] = buf;
-		strcpy(buf, p);
-		buf += strlen(buf) + 1;
-	}
-	return configs;
+	uci_free_package(p);
+	return 0;
 }
 
-