* 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)
{
/* 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 */
next->prev = prev;
}
+static void uci_drop_option(struct uci_option *option)
+{
+ 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(§ion->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, §ion->options, opt) {
+ uci_list_del(&opt->list);
+ uci_drop_option(opt);
+ }
+
if (section->name)
free(section->name);
if (section->type)
struct uci_section *section = NULL;
struct uci_context *ctx = cfg->ctx;
- UCI_TRAP_SAVE(ctx, error)
+ 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(§ion->list);
uci_list_init(§ion->options);
- uci_list_add(&cfg->sections, §ion->list);
section->type = uci_strdup(ctx, type);
- if (name)
+ if (name && name[0])
section->name = uci_strdup(ctx, name);
+ else
+ asprintf(§ion->name, "cfg%d", cfg->n_section);
+ uci_list_add(&cfg->sections, §ion->list);
UCI_TRAP_RESTORE(ctx);
return section;
return NULL;
}
-static void uci_drop_file(struct uci_config *cfg)
+static void uci_drop_config(struct uci_config *cfg)
{
- /* TODO: free children */
+ 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_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;
- UCI_TRAP_SAVE(ctx, error)
+ 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);
return cfg;
error:
- uci_drop_file(cfg);
+ 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;
+}
+