remove unused argument

[project/uci.git] / list.c

diff --git a/list.c b/list.c
index f681611..0b3dd94 100644 (file)
--- 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)
 {
@@ -22,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 */
@@ -35,16 +37,197 @@ static inline void uci_list_add(struct uci_list *head, struct uci_list *ptr)
        __uci_list_add(head->prev, head, 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;
+}
 
-static struct uci_config *uci_add_file(struct uci_context *ctx, const char *name)
+static void uci_drop_option(struct uci_option *option)
 {
-       struct uci_config *cfg;
+       if (!option)
+               return;
+       if (option->name)
+               free(option->name);
+       if (option->value)
+               free(option->value);
+       free(option);
+}
+
+static struct uci_option *uci_add_option(struct uci_section *section, const char *name, const char *value)
+{
+       struct uci_config *cfg = section->config;
+       struct uci_context *ctx = cfg->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;
+}
+
+static void uci_drop_section(struct uci_section *section)
+{
+       struct uci_option *opt;
 
+       if (!section)
+               return;
+
+       uci_foreach_entry(option, &section->options, opt) {
+               uci_list_del(&opt->list);
+               uci_drop_option(opt);
+       }
+
+       if (section->name)
+               free(section->name);
+       if (section->type)
+               free(section->type);
+       free(section);
+}
+
+static struct uci_section *uci_add_section(struct uci_config *cfg, const char *type, const char *name)
+{
+       struct uci_section *section = NULL;
+       struct uci_context *ctx = cfg->ctx;
+
+       UCI_TRAP_SAVE(ctx, error);
+       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)
+               section->name = uci_strdup(ctx, name);
+       uci_list_add(&cfg->sections, &section->list);
+       UCI_TRAP_RESTORE(ctx);
+
+       return section;
+
+error:
+       uci_drop_section(section);
+       UCI_THROW(ctx, ctx->errno);
+       return NULL;
+}
+
+static void uci_drop_config(struct uci_config *cfg)
+{
+       struct uci_section *s;
+
+       if(!cfg)
+               return;
+
+       uci_foreach_entry(section, &cfg->sections, s) {
+               uci_list_del(&s->list);
+               uci_drop_section(s);
+       }
+
+       if (cfg->name)
+               free(cfg->name);
+       free(cfg);
+}
+
+
+static struct uci_config *uci_alloc_config(struct uci_context *ctx, const char *name)
+{
+       struct uci_config *cfg = NULL;
+
+       UCI_TRAP_SAVE(ctx, error);
        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);
-
+       cfg->ctx = ctx;
+       UCI_TRAP_RESTORE(ctx);
        return cfg;
+
+error:
+       uci_drop_config(cfg);
+       UCI_THROW(ctx, ctx->errno);
+       return NULL;
+}
+
+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;
+       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;
+}
+