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

diff --git a/list.c b/list.c
index ba5a9f0..066a9fd 100644
--- a/list.c
+++ b/list.c
@@ -22,19 +22,19 @@ 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)
 {
-	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,173 @@ 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)
+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;
+	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 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;
-
-	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;
-
-error:
-	uci_drop_option(option);
-	UCI_THROW(ctx, ctx->errno);
-	return NULL;
+	if (!e)
+		return;
+
+	if (!uci_list_empty(&e->list))
+		uci_list_del(&e->list);
+	free(e);
 }
 
-static void uci_drop_section(struct uci_section *section)
+static struct uci_option *
+uci_alloc_option(struct uci_section *s, const char *name, const char *value)
 {
-	struct uci_option *opt;
+	struct uci_package *p = s->package;
+	struct uci_context *ctx = p->ctx;
+	struct uci_option *o;
 
-	if (!section)
-		return;
-
-	uci_foreach_entry(option, &section->options, opt) {
-		uci_list_del(&opt->list);
-		uci_drop_option(opt);
-	}
+	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);
 
-	if (section->name)
-		free(section->name);
-	if (section->type)
-		free(section->type);
-	free(section);
+	return o;
 }
 
-static struct uci_section *uci_add_section(struct uci_package *package, const char *type, const char *name)
+static inline void
+uci_free_option(struct uci_option *o)
 {
-	struct uci_section *section = NULL;
-	struct uci_context *ctx = package->ctx;
-
-	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);
-
-	return section;
-
-error:
-	uci_drop_section(section);
-	UCI_THROW(ctx, ctx->errno);
-	return NULL;
+	uci_free_element(&o->e);
 }
 
-static void uci_drop_config(struct uci_package *package)
+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(!package)
-		return;
-
-	uci_foreach_entry(section, &package->sections, s) {
-		uci_list_del(&s->list);
-		uci_drop_section(s);
+	if (!name || !name[0]) {
+		snprintf(buf, 16, "cfg%d", p->n_section);
+		name = buf;
 	}
 
-	if (package->name)
-		free(package->name);
-	free(package);
-}
+	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 struct uci_package *uci_alloc_config(struct uci_context *ctx, const char *name)
+static void
+uci_free_section(struct uci_section *s)
 {
-	struct uci_package *package = NULL;
-
-	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;
-
-error:
-	uci_drop_config(package);
-	UCI_THROW(ctx, ctx->errno);
-	return NULL;
+	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);
 }
 
-int uci_unload(struct uci_context *ctx, const char *name)
+static struct uci_package *
+uci_alloc_package(struct uci_context *ctx, const char *name)
 {
-	struct uci_package *package;
+	struct uci_package *p;
 
-	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, name != NULL);
+	p = uci_alloc_element(ctx, package, name, 0);
+	p->ctx = ctx;
+	uci_list_init(&p->sections);
+	return p;
+}
 
-	uci_foreach_entry(package, &ctx->root, package) {
-		if (!strcmp(package->name, name))
-			goto found;
-	}
-	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+static void
+uci_free_package(struct uci_package *p)
+{
+	struct uci_element *e, *tmp;
 
-found:
-	uci_list_del(&package->list);
-	uci_drop_config(package);
+	if(!p)
+		return;
 
-	return 0;
+	uci_foreach_element_safe(&p->sections, tmp, e) {
+		uci_free_section(uci_to_section(e));
+	}
+	uci_free_element(&p->e);
 }
 
-static inline char *get_filename(char *path)
+static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, char *name)
 {
-	char *p;
+	struct uci_element *e;
 
-	p = strrchr(path, '/');
-	p++;
-	if (!*p)
-		return NULL;
-	return p;
+	uci_foreach_element(list, e) {
+		if (!strcmp(e->name, name))
+			return e;
+	}
+	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 }
 
-char **uci_list_configs(struct uci_context *ctx)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, char *package, char *section, char *option)
 {
-	char **configs;
-	glob_t globbuf;
-	int size, i;
-	char *buf;
+	struct uci_element *e;
+	struct uci_package *p;
+	struct uci_section *s;
+	struct uci_option *o;
 
-	if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
-		return NULL;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, res != NULL);
+	UCI_ASSERT(ctx, package != NULL);
 
-	size = sizeof(char *) * (globbuf.gl_pathc + 1);
-	for(i = 0; i < globbuf.gl_pathc; i++) {
-		char *p;
+	e = uci_lookup_list(ctx, &ctx->root, package);
+	if (!section)
+		goto found;
 
-		p = get_filename(globbuf.gl_pathv[i]);
-		if (!p)
-			continue;
+	p = uci_to_package(e);
+	e = uci_lookup_list(ctx, &p->sections, section);
+	if (!option)
+		goto found;
 
-		size += strlen(p) + 1;
-	}
+	s = uci_to_section(e);
+	e = uci_lookup_list(ctx, &s->options, option);
 
-	configs = malloc(size);
-	if (!configs)
-		return NULL;
+found:
+	*res = e;
+	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, const char *name)
+{
+	struct uci_element *e;
 
-		p = get_filename(globbuf.gl_pathv[i]);
-		if (!p)
-			continue;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, name != NULL);
 
-		configs[i] = buf;
-		strcpy(buf, p);
-		buf += strlen(buf) + 1;
+	uci_foreach_element(&ctx->root, e) {
+		if (!strcmp(e->name, name))
+			goto found;
 	}
-	return configs;
+	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+
+found:
+	uci_free_package(uci_to_package(e));
+
+	return 0;
 }
 
+