move export functionality to libuci

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index f4ab8ec..00fca3f 100644 (file)
--- a/list.c
+++ b/list.c
@@ -24,10 +24,10 @@ 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)
 {
-       prev->next = ptr;
        next->prev = ptr;
        ptr->prev = prev;
        ptr->next = next;
+       prev->next = ptr;
 }
 
 /* inserts a new list entry at the tail of the list */
@@ -71,6 +71,7 @@ static struct uci_option *uci_add_option(struct uci_section *section, const char
        option->value = uci_strdup(ctx, value);
        uci_list_add(&section->options, &option->list);
        UCI_TRAP_RESTORE(ctx);
+       return option;
 
 error:
        uci_drop_option(option);
@@ -103,13 +104,16 @@ static struct uci_section *uci_add_section(struct uci_config *cfg, const char *t
        struct uci_context *ctx = cfg->ctx;
 
        UCI_TRAP_SAVE(ctx, error);
+       cfg->n_section++;
        section = (struct uci_section *) uci_malloc(ctx, sizeof(struct uci_section));
        section->config = cfg;
        uci_list_init(&section->list);
        uci_list_init(&section->options);
        section->type = uci_strdup(ctx, type);
-       if (name)
+       if (name && name[0])
                section->name = uci_strdup(ctx, name);
+       else
+               asprintf(&section->name, "cfg%d", cfg->n_section);
        uci_list_add(&cfg->sections, &section->list);
        UCI_TRAP_RESTORE(ctx);
 
@@ -121,7 +125,7 @@ error:
        return NULL;
 }
 
-static void uci_drop_file(struct uci_config *cfg)
+static void uci_drop_config(struct uci_config *cfg)
 {
        struct uci_section *s;
 
@@ -139,7 +143,7 @@ static void uci_drop_file(struct uci_config *cfg)
 }
 
 
-static struct uci_config *uci_alloc_file(struct uci_context *ctx, const char *name)
+static struct uci_config *uci_alloc_config(struct uci_context *ctx, const char *name)
 {
        struct uci_config *cfg = NULL;
 
@@ -153,12 +157,43 @@ static struct uci_config *uci_alloc_file(struct uci_context *ctx, const char *na
        return cfg;
 
 error:
-       uci_drop_file(cfg);
+       uci_drop_config(cfg);
        UCI_THROW(ctx, ctx->errno);
        return NULL;
 }
 
-char **uci_list_configs(struct uci_context *ctx)
+int uci_unload(struct uci_context *ctx, const char *name)
+{
+       struct uci_config *cfg;
+
+       UCI_HANDLE_ERR(ctx);
+       UCI_ASSERT(ctx, name != NULL);
+
+       uci_foreach_entry(config, &ctx->root, cfg) {
+               if (!strcmp(cfg->name, name))
+                       goto found;
+       }
+       UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+
+found:
+       uci_list_del(&cfg->list);
+       uci_drop_config(cfg);
+
+       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()
 {
        char **configs;
        glob_t globbuf;
@@ -169,8 +204,15 @@ char **uci_list_configs(struct uci_context *ctx)
                return NULL;
 
        size = sizeof(char *) * (globbuf.gl_pathc + 1);
-       for(i = 0; i < globbuf.gl_pathc; i++)
-               size += strlen(globbuf.gl_pathv[i]) + 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)
@@ -179,8 +221,14 @@ char **uci_list_configs(struct uci_context *ctx)
        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, globbuf.gl_pathv[i]);
+               strcpy(buf, p);
                buf += strlen(buf) + 1;
        }
        return configs;