X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=list.c;h=059106191de3c013d6dc850ec5b1ccd3508a70bb;hp=ea1c1ac18c94ccc1b2dfeab15c6956e393de8de5;hb=ed971c19dfb7a07abdfe9f58ba04b31aa49d306a;hpb=cc9710af5381d20ffa200978816a0fec999bbb62

diff --git a/list.c b/list.c
index ea1c1ac..0591061 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)
@@ -69,9 +69,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);
@@ -157,76 +154,62 @@ uci_free_package(struct uci_package *p)
 	uci_free_element(&p->e);
 }
 
-
-int uci_unload(struct uci_context *ctx, const char *name)
+static struct uci_element *uci_lookup_list(struct uci_context *ctx, struct uci_list *list, char *name)
 {
 	struct uci_element *e;
 
-	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, name != NULL);
-
-	uci_foreach_element(&ctx->root, e) {
+	uci_foreach_element(list, e) {
 		if (!strcmp(e->name, name))
-			goto found;
+			return e;
 	}
 	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
-
-found:
-	uci_free_package(uci_to_package(e));
-
-	return 0;
 }
 
-static inline char *get_filename(char *path)
+int uci_lookup(struct uci_context *ctx, struct uci_element **res, char *package, char *section, char *option)
 {
-	char *p;
+	struct uci_element *e;
+	struct uci_package *p;
+	struct uci_section *s;
+	struct uci_option *o;
 
-	p = strrchr(path, '/');
-	p++;
-	if (!*p)
-		return NULL;
-	return p;
-}
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, res != NULL);
+	UCI_ASSERT(ctx, package != NULL);
 
-char **uci_list_configs(struct uci_context *ctx)
-{
-	char **configs;
-	glob_t globbuf;
-	int size, i;
-	char *buf;
+	e = uci_lookup_list(ctx, &ctx->root, package);
+	if (!section)
+		goto found;
 
-	if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
-		return NULL;
+	p = uci_to_package(e);
+	e = uci_lookup_list(ctx, &p->sections, section);
+	if (!option)
+		goto found;
 
-	size = sizeof(char *) * (globbuf.gl_pathc + 1);
-	for(i = 0; i < globbuf.gl_pathc; i++) {
-		char *p;
+	s = uci_to_section(e);
+	e = uci_lookup_list(ctx, &s->options, option);
 
-		p = get_filename(globbuf.gl_pathv[i]);
-		if (!p)
-			continue;
+found:
+	*res = e;
+	return 0;
+}
 
-		size += strlen(p) + 1;
-	}
+int uci_unload(struct uci_context *ctx, const char *name)
+{
+	struct uci_element *e;
 
-	configs = malloc(size);
-	if (!configs)
-		return NULL;
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, name != NULL);
 
-	memset(configs, 0, size);
-	buf = (char *) &configs[globbuf.gl_pathc + 1];
-	for(i = 0; i < globbuf.gl_pathc; i++) {
-		char *p;
+	uci_foreach_element(&ctx->root, e) {
+		if (!strcmp(e->name, name))
+			goto found;
+	}
+	UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
-		p = get_filename(globbuf.gl_pathv[i]);
-		if (!p)
-			continue;
+found:
+	uci_free_package(uci_to_package(e));
 
-		configs[i] = buf;
-		strcpy(buf, p);
-		buf += strlen(buf) + 1;
-	}
-	return configs;
+	return 0;
 }