X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=36ef34684539f9ea9ed5b26c20997acb777e95d8;hp=54003c18043a18d74857f32dc60bee1d8762e08e;hb=85320f3c5c51c2780f1d33866c931de1739b01ce;hpb=6e141df7e2a603fcfced2f020e8964492c34a307

diff --git a/file.c b/file.c
index 54003c1..36ef346 100644
--- a/file.c
+++ b/file.c
@@ -84,10 +84,9 @@ static void uci_file_cleanup(struct uci_context *ctx)
 		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)
@@ -249,7 +248,7 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required)
 		UCI_THROW(ctx, UCI_ERR_PARSE);
 	}
 
-	return uci_strdup(ctx, val);
+	return val;
 }
 
 /*
@@ -281,10 +280,10 @@ static void uci_switch_config(struct uci_context *ctx)
 	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;
 	}
 
@@ -301,7 +300,7 @@ static void uci_switch_config(struct uci_context *ctx)
 ignore:
 	ctx->errno = 0;
 
-	pctx->cfg = uci_alloc_config(ctx, name);
+	pctx->package = uci_alloc_package(ctx, name);
 }
 
 /*
@@ -314,18 +313,10 @@ static void uci_parse_package(struct uci_context *ctx, char **str)
 	/* 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);
 }
 
 /*
@@ -336,7 +327,7 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 	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";
@@ -348,20 +339,10 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 	/* 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);
 }
 
 /*
@@ -380,20 +361,10 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
 	/* 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);
 }
 
 
@@ -442,7 +413,7 @@ static void uci_parse_line(struct uci_context *ctx)
  */
 static char *uci_escape(struct uci_context *ctx, char *str)
 {
-	char *s, *p, *t;
+	char *s, *p;
 	int pos = 0;
 
 	if (!ctx->buf) {
@@ -479,42 +450,45 @@ static char *uci_escape(struct uci_context *ctx, char *str)
 /*
  * 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;
 
@@ -539,8 +513,8 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 			uci_parse_line(ctx);
 	}
 
-	if (cfg)
-		*cfg = pctx->cfg;
+	if (package)
+		*package = pctx->package;
 
 	pctx->name = NULL;
 	uci_switch_config(ctx);
@@ -551,7 +525,7 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	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;
@@ -561,9 +535,6 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_config **cfg)
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, name != NULL);
 
-ignore:
-	ctx->errno = 0;
-
 	switch (name[0]) {
 	case '.':
 	case '/':
@@ -590,6 +561,6 @@ ignore:
 	if (!file)
 		UCI_THROW(ctx, UCI_ERR_IO);
 
-	return uci_import(ctx, file, name, cfg);
+	return uci_import(ctx, file, name, package);
 }