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

diff --git a/list.c b/list.c
index f681611..666989a 100644
--- a/list.c
+++ b/list.c
@@ -12,6 +12,8 @@
  * GNU General Public License for more details.
  */
 
+#include <glob.h>
+
 /* initialize a list head/item */
 static inline void uci_list_init(struct uci_list *ptr)
 {
@@ -20,31 +22,249 @@ static inline void uci_list_init(struct uci_list *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)
+static inline void uci_list_insert(struct uci_list *list, struct uci_list *ptr)
 {
-	prev->next = ptr;
-	next->prev = ptr;
-	ptr->prev = prev;
-	ptr->next = next;
+	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)
+{
+	struct uci_list *next, *prev;
+
+	next = ptr->next;
+	prev = ptr->prev;
+
+	prev->next = next;
+	next->prev = prev;
+
+	uci_list_init(ptr);
 }
 
+static struct uci_element *
+uci_alloc_generic(struct uci_context *ctx, int type, const char *name, int size)
+{
+	struct uci_element *e;
+	void *ptr;
+
+	ptr = uci_malloc(ctx, size + strlen(name) + 1);
+	e = (struct uci_element *) ptr;
+	e->type = type;
+	e->name = (char *) ptr + size;
+	strcpy(e->name, name);
+	uci_list_init(&e->list);
+
+	return e;
+}
+
+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);
+}
+
+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;
+
+	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 inline void
+uci_free_option(struct uci_option *o)
+{
+	uci_free_element(&o->e);
+}
+
+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;
+	char buf[16];
+
+	if (!name || !name[0]) {
+		snprintf(buf, 16, "cfg%d", p->n_section);
+		name = buf;
+	}
+
+	s = uci_alloc_element(ctx, section, name, strlen(type) + 1);
+	s->type = uci_dataptr(s);
+	s->package = p;
+	strcpy(s->type, type);
+	uci_list_init(&s->options);
+	uci_list_add(&p->sections, &s->e.list);
+
+	return s;
+}
+
+static void
+uci_free_section(struct uci_section *s)
+{
+	struct uci_element *o, *tmp;
+
+	uci_foreach_element_safe(&s->options, tmp, o) {
+		uci_free_option(uci_to_option(o));
+	}
+	uci_free_element(&s->e);
+}
+
+static struct uci_package *
+uci_alloc_package(struct uci_context *ctx, const char *name)
+{
+	struct uci_package *p;
+
+	p = uci_alloc_element(ctx, package, name, 0);
+	p->ctx = ctx;
+	uci_list_init(&p->sections);
+	return p;
+}
 
-static struct uci_config *uci_add_file(struct uci_context *ctx, const char *name)
+static void
+uci_free_package(struct uci_package *p)
 {
-	struct uci_config *cfg;
+	struct uci_element *e, *tmp;
 
-	cfg = (struct uci_config *) uci_malloc(ctx, sizeof(struct uci_config));
-	uci_list_init(&cfg->list);
-	uci_list_init(&cfg->sections);
-	cfg->name = uci_strdup(ctx, name);
-	uci_list_add(&ctx->root, &cfg->list);
+	if(!p)
+		return;
 
-	return cfg;
+	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)
+{
+	struct uci_element *e;
+
+	uci_foreach_element(list, e) {
+		if (!strcmp(e->name, name))
+			return e;
+	}
+	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+}
+
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, char *package, 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);
+
+	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;
+
+	s = uci_to_section(e);
+	e = uci_lookup_list(ctx, &s->options, option);
+
+found:
+	*res = e;
+	return 0;
+}
+
+int uci_unload(struct uci_context *ctx, const char *name)
+{
+	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_THROW(ctx, UCI_ERR_NOTFOUND);
+
+found:
+	uci_free_package(uci_to_package(e));
+
+	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)
+{
+	char **configs;
+	glob_t globbuf;
+	int size, i;
+	char *buf;
+
+	if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
+		return NULL;
+
+	size = sizeof(char *) * (globbuf.gl_pathc + 1);
+	for(i = 0; i < globbuf.gl_pathc; i++) {
+		char *p;
+
+		p = get_filename(globbuf.gl_pathv[i]);
+		if (!p)
+			continue;
+
+		size += strlen(p) + 1;
+	}
+
+	configs = malloc(size);
+	if (!configs)
+		return NULL;
+
+	memset(configs, 0, size);
+	buf = (char *) &configs[globbuf.gl_pathc + 1];
+	for(i = 0; i < globbuf.gl_pathc; i++) {
+		char *p;
+
+		p = get_filename(globbuf.gl_pathv[i]);
+		if (!p)
+			continue;
+
+		configs[i] = buf;
+		strcpy(buf, p);
+		buf += strlen(buf) + 1;
+	}
+	return configs;
+}
+
+