/* 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 */
option->value = uci_strdup(ctx, value);
uci_list_add(§ion->options, &option->list);
UCI_TRAP_RESTORE(ctx);
+ return option;
error:
uci_drop_option(option);
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(§ion->list);
uci_list_init(§ion->options);
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 NULL;
}
-static void uci_drop_file(struct uci_config *cfg)
+static void uci_drop_config(struct uci_config *cfg)
{
struct uci_section *s;
}
-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;
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;
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)
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;