if (ctx->buf) {
free(ctx->buf);
+ ctx->buf = NULL;
ctx->bufsz = 0;
}
return;
ctx->pctx = NULL;
- if (pctx->cfg) {
- uci_list_del(&pctx->cfg->list);
- uci_drop_config(pctx->cfg);
- }
+ if (pctx->package)
+ uci_free_package(pctx->package);
+
if (pctx->buf)
free(pctx->buf);
if (pctx->file)
UCI_THROW(ctx, UCI_ERR_PARSE);
}
- return uci_strdup(ctx, val);
+ return val;
}
/*
name = pctx->name;
/* add the last config to main config file list */
- if (pctx->cfg) {
- uci_list_add(&ctx->root, &pctx->cfg->list);
+ if (pctx->package) {
+ uci_list_add(&ctx->root, &pctx->package->e.list);
- pctx->cfg = NULL;
+ pctx->package = NULL;
pctx->section = NULL;
}
ignore:
ctx->errno = 0;
- pctx->cfg = uci_alloc_config(ctx, name);
+ pctx->package = uci_alloc_package(ctx, name);
}
/*
/* command string null-terminated by strtok */
*str += strlen(*str) + 1;
- UCI_TRAP_SAVE(ctx, error);
name = next_arg(ctx, str, true);
assert_eol(ctx, str);
ctx->pctx->name = name;
uci_switch_config(ctx);
- UCI_TRAP_RESTORE(ctx);
- return;
-
-error:
- if (name)
- free(name);
- UCI_THROW(ctx, ctx->errno);
}
/*
char *name = NULL;
char *type = NULL;
- if (!ctx->pctx->cfg) {
+ if (!ctx->pctx->package) {
if (!ctx->pctx->name) {
ctx->pctx->byte = *str - ctx->pctx->buf;
ctx->pctx->reason = "attempting to import a file without a package name";
/* command string null-terminated by strtok */
*str += strlen(*str) + 1;
- UCI_TRAP_SAVE(ctx, error);
type = next_arg(ctx, str, true);
name = next_arg(ctx, str, false);
assert_eol(ctx, str);
- ctx->pctx->section = uci_add_section(ctx->pctx->cfg, type, name);
- UCI_TRAP_RESTORE(ctx);
- return;
-
-error:
- if (name)
- free(name);
- if (type)
- free(type);
- UCI_THROW(ctx, ctx->errno);
+ ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name);
}
/*
/* command string null-terminated by strtok */
*str += strlen(*str) + 1;
- UCI_TRAP_SAVE(ctx, error);
name = next_arg(ctx, str, true);
value = next_arg(ctx, str, true);
assert_eol(ctx, str);
- uci_add_option(ctx->pctx->section, name, value);
- UCI_TRAP_RESTORE(ctx);
- return;
-
-error:
- if (name)
- free(name);
- if (value)
- free(value);
- UCI_THROW(ctx, ctx->errno);
+ uci_alloc_option(ctx->pctx->section, name, value);
}
/*
* export a single config package to a file stream
*/
-static void uci_export_config(struct uci_config *cfg, FILE *stream)
+static void uci_export_package(struct uci_package *p, FILE *stream)
{
- struct uci_context *ctx = cfg->ctx;
- struct uci_section *s;
- struct uci_option *o;
-
- fprintf(stream, "package '%s'\n", uci_escape(ctx, cfg->name));
- uci_foreach_entry(section, &cfg->sections, s) {
- fprintf(stream, "\nconfig '%s'", uci_escape(ctx, s->type));
- fprintf(stream, " '%s'\n", uci_escape(ctx, s->name));
- uci_foreach_entry(option, &s->options, o) {
- fprintf(stream, "\toption '%s'", uci_escape(ctx, o->name));
- fprintf(stream, " '%s'\n", uci_escape(ctx, o->value));
+ struct uci_context *ctx = p->ctx;
+ struct uci_element *s, *o;
+
+ fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name));
+ uci_foreach_element(&p->sections, s) {
+ struct uci_section *sec = uci_to_section(s);
+ fprintf(stream, "\nconfig '%s'", uci_escape(ctx, sec->type));
+ fprintf(stream, " '%s'\n", uci_escape(ctx, sec->e.name));
+ uci_foreach_element(&sec->options, o) {
+ struct uci_option *opt = uci_to_option(o);
+ fprintf(stream, "\toption '%s'", uci_escape(ctx, opt->e.name));
+ fprintf(stream, " '%s'\n", uci_escape(ctx, opt->value));
}
}
fprintf(stream, "\n");
}
-int uci_export(struct uci_context *ctx, FILE *stream, struct uci_config *cfg)
+int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package)
{
+ struct uci_element *e;
+
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, stream != NULL);
- if (cfg) {
- uci_export_config(cfg, stream);
+ if (package) {
+ uci_export_package(package, stream);
goto done;
}
- uci_foreach_entry(config, &ctx->root, cfg) {
- uci_export_config(cfg, stream);
+ uci_foreach_element(&ctx->root, e) {
+ uci_export_package(uci_to_package(e), stream);
}
done:
return 0;
}
-int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg)
+int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package)
{
struct uci_parse_context *pctx;
uci_parse_line(ctx);
}
- if (cfg)
- *cfg = pctx->cfg;
+ if (package)
+ *package = pctx->package;
pctx->name = NULL;
uci_switch_config(ctx);
return 0;
}
-int uci_load(struct uci_context *ctx, const char *name, struct uci_config **cfg)
+int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
{
struct stat statbuf;
char *filename;
if (!file)
UCI_THROW(ctx, UCI_ERR_IO);
- return uci_import(ctx, file, name, cfg);
+ return uci_import(ctx, file, name, package);
}