/* 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 */
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_package *package = section->package;
+ struct uci_context *ctx = package->ctx;
struct uci_option *option = NULL;
UCI_TRAP_SAVE(ctx, error);
option->value = uci_strdup(ctx, value);
uci_list_add(§ion->options, &option->list);
UCI_TRAP_RESTORE(ctx);
+ return option;
error:
uci_drop_option(option);
free(section);
}
-static struct uci_section *uci_add_section(struct uci_config *cfg, const char *type, const char *name)
+static struct uci_section *uci_add_section(struct uci_package *package, const char *type, const char *name)
{
struct uci_section *section = NULL;
- struct uci_context *ctx = cfg->ctx;
+ struct uci_context *ctx = package->ctx;
UCI_TRAP_SAVE(ctx, error);
+ package->n_section++;
section = (struct uci_section *) uci_malloc(ctx, sizeof(struct uci_section));
- section->config = cfg;
+ section->package = package;
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);
- uci_list_add(&cfg->sections, §ion->list);
+ else
+ asprintf(§ion->name, "cfg%d", package->n_section);
+ uci_list_add(&package->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_package *package)
{
struct uci_section *s;
- if(!cfg)
+ if(!package)
return;
- uci_foreach_entry(section, &cfg->sections, s) {
+ uci_foreach_entry(section, &package->sections, s) {
uci_list_del(&s->list);
uci_drop_section(s);
}
- if (cfg->name)
- free(cfg->name);
- free(cfg);
+ if (package->name)
+ free(package->name);
+ free(package);
}
-static struct uci_config *uci_alloc_file(struct uci_context *ctx, const char *name)
+static struct uci_package *uci_alloc_config(struct uci_context *ctx, const char *name)
{
- struct uci_config *cfg = NULL;
+ struct uci_package *package = 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);
- cfg->ctx = ctx;
+ package = (struct uci_package *) uci_malloc(ctx, sizeof(struct uci_package));
+ uci_list_init(&package->list);
+ uci_list_init(&package->sections);
+ package->name = uci_strdup(ctx, name);
+ package->ctx = ctx;
UCI_TRAP_RESTORE(ctx);
- return cfg;
+ return package;
error:
- uci_drop_file(cfg);
+ uci_drop_config(package);
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_package *package;
+
+ UCI_HANDLE_ERR(ctx);
+ UCI_ASSERT(ctx, name != NULL);
+
+ uci_foreach_entry(package, &ctx->root, package) {
+ if (!strcmp(package->name, name))
+ goto found;
+ }
+ UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+
+found:
+ uci_list_del(&package->list);
+ uci_drop_config(package);
+
+ 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;