X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=e817118472f06db1ef3476b88d93ba3ab8f18881;hp=ba5a9f0beedbc30545e3758e756f8dec4007ddb4;hb=031b620e1f3a16078da45ce00352508764902786;hpb=a1f1ee31878c71cb460126d07429eab07587d170

diff --git a/list.c b/list.c
index ba5a9f0..e817118 100644
--- a/list.c
+++ b/list.c
@@ -2,9 +2,9 @@
  * libuci - Library for the Unified Configuration Interface
  * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
  *
- * this program is free software; you can redistribute it and/or modify
- * it under the terms of the gnu lesser general public license version 2.1
- * as published by the free software foundation
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 2.1
+ * as published by the Free Software Foundation
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,20 +21,20 @@ static inline void uci_list_init(struct uci_list *ptr)
 	ptr->next = ptr;
 }
 
-/* inserts a new list entry between two consecutive entries */
-static inline void __uci_list_add(struct uci_list *prev, struct uci_list *next, struct uci_list *ptr)
+/* inserts a new list entry after a given entry */
+static inline void uci_list_insert(struct uci_list *list, struct uci_list *ptr)
 {
-	next->prev = ptr;
-	ptr->prev = prev;
-	ptr->next = next;
-	prev->next = ptr;
+	list->next->prev = ptr;
+	ptr->prev = list;
+	ptr->next = list->next;
+	list->next = ptr;
 }
 
 /* inserts a new list entry at the tail of the list */
 static inline void uci_list_add(struct uci_list *head, struct uci_list *ptr)
 {
 	/* NB: head->prev points at the tail */
-	__uci_list_add(head->prev, head, ptr);
+	uci_list_insert(head->prev, ptr);
 }
 
 static inline void uci_list_del(struct uci_list *ptr)
@@ -46,191 +46,424 @@ static inline void uci_list_del(struct uci_list *ptr)
 
 	prev->next = next;
 	next->prev = prev;
+
+	uci_list_init(ptr);
 }
 
-static void uci_drop_option(struct uci_option *option)
+/* 
+ * 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)
 {
-	if (!option)
-		return;
-	if (option->name)
-		free(option->name);
-	if (option->value)
-		free(option->value);
-	free(option);
+	struct uci_element *e;
+	int datalen = size;
+	void *ptr;
+
+	ptr = uci_malloc(ctx, datalen);
+	e = (struct uci_element *) ptr;
+	e->type = type;
+	if (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 struct uci_option *uci_add_option(struct uci_section *section, const char *name, const char *value)
+static void
+uci_free_element(struct uci_element *e)
 {
-	struct uci_package *package = section->package;
-	struct uci_context *ctx = package->ctx;
-	struct uci_option *option = NULL;
+	if (e->name)
+		free(e->name);
+	if (!uci_list_empty(&e->list))
+		uci_list_del(&e->list);
+	free(e);
+}
 
-	UCI_TRAP_SAVE(ctx, error);
-	option = (struct uci_option *) uci_malloc(ctx, sizeof(struct uci_option));
-	option->name = uci_strdup(ctx, name);
-	option->value = uci_strdup(ctx, value);
-	uci_list_add(&section->options, &option->list);
-	UCI_TRAP_RESTORE(ctx);
-	return option;
+static struct uci_option *
+uci_alloc_option(struct uci_section *s, const char *name, const char *value)
+{
+	struct uci_package *p = s->package;
+	struct uci_context *ctx = p->ctx;
+	struct uci_option *o;
 
-error:
-	uci_drop_option(option);
-	UCI_THROW(ctx, ctx->errno);
-	return NULL;
+	o = uci_alloc_element(ctx, option, name, strlen(value) + 1);
+	o->value = uci_dataptr(o);
+	o->section = s;
+	strcpy(o->value, value);
+	uci_list_add(&s->options, &o->e.list);
+
+	return o;
 }
 
-static void uci_drop_section(struct uci_section *section)
+static inline void
+uci_free_option(struct uci_option *o)
 {
-	struct uci_option *opt;
+	if ((o->value != uci_dataptr(o)) &&
+		(o->value != NULL))
+		free(o->value);
+	uci_free_element(&o->e);
+}
 
-	if (!section)
-		return;
+static struct uci_section *
+uci_alloc_section(struct uci_package *p, const char *type, const char *name)
+{
+	struct uci_context *ctx = p->ctx;
+	struct uci_section *s;
 
-	uci_foreach_entry(option, &section->options, opt) {
-		uci_list_del(&opt->list);
-		uci_drop_option(opt);
-	}
+	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);
+	if (name == NULL)
+		s->anonymous = true;
+
+	uci_list_add(&p->sections, &s->e.list);
 
-	if (section->name)
-		free(section->name);
-	if (section->type)
-		free(section->type);
-	free(section);
+	return s;
 }
 
-static struct uci_section *uci_add_section(struct uci_package *package, const char *type, const char *name)
+static void
+uci_free_section(struct uci_section *s)
 {
-	struct uci_section *section = NULL;
-	struct uci_context *ctx = package->ctx;
+	struct uci_element *o, *tmp;
 
-	UCI_TRAP_SAVE(ctx, error);
-	package->n_section++;
-	section = (struct uci_section *) uci_malloc(ctx, sizeof(struct uci_section));
-	section->package = package;
-	uci_list_init(&section->list);
-	uci_list_init(&section->options);
-	section->type = uci_strdup(ctx, type);
-	if (name && name[0])
-		section->name = uci_strdup(ctx, name);
-	else
-		asprintf(&section->name, "cfg%d", package->n_section);
-	uci_list_add(&package->sections, &section->list);
-	UCI_TRAP_RESTORE(ctx);
+	uci_foreach_element_safe(&s->options, tmp, o) {
+		uci_free_option(uci_to_option(o));
+	}
+	if ((s->type != uci_dataptr(s)) &&
+		(s->type != NULL))
+		free(s->type);
+	uci_free_element(&s->e);
+}
 
-	return section;
+static struct uci_package *
+uci_alloc_package(struct uci_context *ctx, const char *name)
+{
+	struct uci_package *p;
 
-error:
-	uci_drop_section(section);
-	UCI_THROW(ctx, ctx->errno);
-	return NULL;
+	p = uci_alloc_element(ctx, package, name, 0);
+	p->ctx = ctx;
+	uci_list_init(&p->sections);
+	uci_list_init(&p->history);
+	uci_list_init(&p->saved_history);
+	return p;
 }
 
-static void uci_drop_config(struct uci_package *package)
+static void
+uci_free_package(struct uci_package **package)
 {
-	struct uci_section *s;
+	struct uci_element *e, *tmp;
+	struct uci_package *p = *package;
 
-	if(!package)
+	if(!p)
 		return;
 
-	uci_foreach_entry(section, &package->sections, s) {
-		uci_list_del(&s->list);
-		uci_drop_section(s);
+	if (p->path)
+		free(p->path);
+	uci_foreach_element_safe(&p->sections, tmp, e) {
+		uci_free_section(uci_to_section(e));
 	}
-
-	if (package->name)
-		free(package->name);
-	free(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;
 }
 
+static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, const char *name)
+{
+	struct uci_element *e;
+
+	uci_foreach_element(list, e) {
+		if (!strcmp(e->name, name))
+			return e;
+	}
+	return NULL;
+}
 
-static struct uci_package *uci_alloc_config(struct uci_context *ctx, const char *name)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, struct uci_package *p, char *section, char *option)
 {
-	struct uci_package *package = NULL;
+	struct uci_element *e;
+	struct uci_section *s;
 
-	UCI_TRAP_SAVE(ctx, error);
-	package = (struct uci_package *) uci_malloc(ctx, sizeof(struct uci_package));
-	uci_list_init(&package->list);
-	uci_list_init(&package->sections);
-	package->name = uci_strdup(ctx, name);
-	package->ctx = ctx;
-	UCI_TRAP_RESTORE(ctx);
-	return package;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, res != NULL);
+	UCI_ASSERT(ctx, p != NULL);
+	UCI_ASSERT(ctx, uci_validate_name(section));
+	if (option)
+		UCI_ASSERT(ctx, uci_validate_name(option));
+
+	e = uci_lookup_list(ctx, &p->sections, section);
+	if (!e)
+		goto notfound;
+
+	if (option) {
+		s = uci_to_section(e);
+		e = uci_lookup_list(ctx, &s->options, option);
+	}
 
-error:
-	uci_drop_config(package);
-	UCI_THROW(ctx, ctx->errno);
-	return NULL;
+	*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_del_element(struct uci_context *ctx, struct uci_element *e)
 {
-	struct uci_package *package;
+	/* NB: UCI_INTERNAL use means without history tracking */
+	bool internal = ctx->internal;
+	struct uci_package *p = NULL;
+	struct uci_section *s = NULL;
+	struct uci_option *o = NULL;
+	struct uci_element *i, *tmp;
+	char *option = NULL;
 
 	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, name != NULL);
+	UCI_ASSERT(ctx, e != NULL);
+
+	switch(e->type) {
+	case UCI_TYPE_SECTION:
+		s = uci_to_section(e);
+		uci_foreach_element_safe(&s->options, tmp, i) {
+			uci_del_element(ctx, i);
+		}
+		break;
+	case UCI_TYPE_OPTION:
+		o = uci_to_option(e);
+		s = o->section;
+		p = s->package;
+		option = e->name;
+		break;
+	default:
+		UCI_THROW(ctx, UCI_ERR_INVAL);
+		break;
+	}
 
-	uci_foreach_entry(package, &ctx->root, package) {
-		if (!strcmp(package->name, name))
-			goto found;
+	p = s->package;
+	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:
+		uci_free_section(s);
+		break;
+	case UCI_TYPE_OPTION:
+		uci_free_option(o);
+		break;
+	default:
+		break;
 	}
-	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	return 0;
+}
 
-found:
-	uci_list_del(&package->list);
-	uci_drop_config(package);
+int uci_set_element_value(struct uci_context *ctx, struct uci_element **element, char *value)
+{
+	/* NB: UCI_INTERNAL use means without history tracking */
+	bool internal = ctx->internal;
+	struct uci_list *list;
+	struct uci_element *e;
+	struct uci_package *p;
+	struct uci_section *s;
+	char *section;
+	char *option;
+	char *str;
+	int size;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, (element != NULL) && (*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:
+		UCI_ASSERT(ctx, uci_validate_str(value, false));
+		size = sizeof(struct uci_section);
+		s = uci_to_section(e);
+		section = e->name;
+		option = NULL;
+		break;
+	case UCI_TYPE_OPTION:
+		UCI_ASSERT(ctx, value != NULL);
+		size = sizeof(struct uci_option);
+		s = uci_to_option(e)->section;
+		section = s->e.name;
+		option = e->name;
+		break;
+	default:
+		UCI_THROW(ctx, UCI_ERR_INVAL);
+		return 0;
+	}
+	p = s->package;
+	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);
+	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 = str;
+		break;
+	case UCI_TYPE_OPTION:
+		uci_to_option(e)->value = str;
+		break;
+	default:
+		break;
+	}
 
 	return 0;
 }
 
-static inline char *get_filename(char *path)
+int uci_rename(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *name)
 {
-	char *p;
+	/* NB: UCI_INTERNAL use means without history tracking */
+	bool internal = ctx->internal;
+	struct uci_element *e;
 
-	p = strrchr(path, '/');
-	p++;
-	if (!*p)
-		return NULL;
-	return p;
+	UCI_HANDLE_ERR(ctx);
+
+	/* NB: p, section, option validated by uci_lookup */
+	UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
+
+	if (!internal && p->confdir)
+		uci_add_history(ctx, &p->history, UCI_CMD_RENAME, section, option, name);
+
+	name = uci_strdup(ctx, name);
+	if (e->name)
+		free(e->name);
+	e->name = name;
+
+	return 0;
 }
 
-char **uci_list_configs(struct uci_context *ctx)
+
+int uci_delete(struct uci_context *ctx, struct uci_package *p, char *section, char *option)
 {
-	char **configs;
-	glob_t globbuf;
-	int size, i;
-	char *buf;
+	/* NB: pass on internal flag to uci_del_element */
+	bool internal = ctx->internal;
+	struct uci_element *e;
 
-	if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
-		return NULL;
+	UCI_HANDLE_ERR(ctx);
+
+	/* NB: p, section, option validated by uci_lookup */
+	UCI_INTERNAL(uci_lookup, ctx, &e, p, section, option);
 
-	size = sizeof(char *) * (globbuf.gl_pathc + 1);
-	for(i = 0; i < globbuf.gl_pathc; i++) {
-		char *p;
+	ctx->internal = internal;
+	return uci_del_element(ctx, e);
+}
+
+int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char *option, char *value)
+{
+	/* NB: UCI_INTERNAL use means without history tracking */
+	bool internal = ctx->internal;
+	struct uci_element *e = NULL;
+	struct uci_section *s = NULL;
+	struct uci_option *o = NULL;
 
-		p = get_filename(globbuf.gl_pathv[i]);
-		if (!p)
-			continue;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, p != NULL);
+	UCI_ASSERT(ctx, uci_validate_name(section));
+	if (option) {
+		UCI_ASSERT(ctx, uci_validate_name(option));
+		UCI_ASSERT(ctx, value != NULL);
+	} else {
+		UCI_ASSERT(ctx, uci_validate_str(value, false));
+	}
 
-		size += strlen(p) + 1;
+	/*
+	 * 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, &p->sections, section);
+	if (!e)
+		goto notfound;
+
+	s = uci_to_section(e);
+	if (ctx->pctx && ctx->pctx->merge)
+		ctx->pctx->section = s;
+
+	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;
+
+	ctx->internal = internal;
+	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 */
+	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 {
+		s = uci_alloc_section(p, value, section);
+		if (ctx->pctx && ctx->pctx->merge)
+			ctx->pctx->section = s;
+	}
 
-	memset(configs, 0, size);
-	buf = (char *) &configs[globbuf.gl_pathc + 1];
-	for(i = 0; i < globbuf.gl_pathc; i++) {
-		char *p;
+	return 0;
+}
 
-		p = get_filename(globbuf.gl_pathv[i]);
-		if (!p)
-			continue;
+int uci_unload(struct uci_context *ctx, struct uci_package *p)
+{
+	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;
 }