X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=6cc2eae30cf06c6eda5a41750ae9233a58c5085b;hp=fe52876fa446001cfa1562653b157fc9a9bc6178;hb=1188f6ac8a938d88fb8d40d9ca5e2564d5c02042;hpb=b69b459ecce221f92235d0def138ff4af3c22543

diff --git a/file.c b/file.c
index fe52876..6cc2eae 100644
--- a/file.c
+++ b/file.c
@@ -16,8 +16,10 @@
  * This file contains the code for parsing uci config files
  */
 
+#define _GNU_SOURCE
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/file.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <fcntl.h>
@@ -372,7 +374,7 @@ static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
  */
 static void uci_parse_config(struct uci_context *ctx, char **str)
 {
-	struct uci_section *s;
+	struct uci_parse_context *pctx = ctx->pctx;
 	char *name = NULL;
 	char *type = NULL;
 
@@ -390,7 +392,16 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 	type = next_arg(ctx, str, true, true);
 	name = next_arg(ctx, str, false, true);
 	assert_eol(ctx, str);
-	ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name);
+
+	if (pctx->merge) {
+		UCI_TRAP_SAVE(ctx, error);
+		uci_set(ctx, pctx->package, name, NULL, type);
+		UCI_TRAP_RESTORE(ctx);
+		return;
+error:
+		UCI_THROW(ctx, ctx->errno);
+	} else
+		pctx->section = uci_alloc_section(pctx->package, type, name);
 }
 
 /*
@@ -398,10 +409,11 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
  */
 static void uci_parse_option(struct uci_context *ctx, char **str)
 {
+	struct uci_parse_context *pctx = ctx->pctx;
 	char *name = NULL;
 	char *value = NULL;
 
-	if (!ctx->pctx->section)
+	if (!pctx->section)
 		uci_parse_error(ctx, *str, "option command found before the first section");
 
 	/* command string null-terminated by strtok */
@@ -410,7 +422,16 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
 	name = next_arg(ctx, str, true, true);
 	value = next_arg(ctx, str, true, false);
 	assert_eol(ctx, str);
-	uci_alloc_option(ctx->pctx->section, name, value);
+
+	if (pctx->merge) {
+		UCI_TRAP_SAVE(ctx, error);
+		uci_set(ctx, pctx->package, pctx->section->e.name, name, value);
+		UCI_TRAP_RESTORE(ctx);
+		return;
+error:
+		UCI_THROW(ctx, ctx->errno);
+	} else
+		uci_alloc_option(pctx->section, name, value);
 }
 
 
@@ -504,7 +525,7 @@ static void uci_export_package(struct uci_package *p, FILE *stream, bool header)
 	uci_foreach_element(&p->sections, s) {
 		struct uci_section *sec = uci_to_section(s);
 		fprintf(stream, "\nconfig '%s'", uci_escape(ctx, sec->type));
-		if (!sec->anonymous)
+		if (!sec->anonymous || (ctx->flags & UCI_FLAG_EXPORT_NAME))
 			fprintf(stream, " '%s'", uci_escape(ctx, sec->e.name));
 		fprintf(stream, "\n");
 		uci_foreach_element(&sec->options, o) {
@@ -537,6 +558,7 @@ int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *packag
 int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single)
 {
 	struct uci_parse_context *pctx;
+	UCI_HANDLE_ERR(ctx);
 
 	/* make sure no memory from previous parse attempts is leaked */
 	uci_file_cleanup(ctx);
@@ -544,6 +566,10 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
 	ctx->pctx = pctx;
 	pctx->file = stream;
+	if (*package && single) {
+		pctx->package = *package;
+		pctx->merge = true;
+	}
 
 	/*
 	 * If 'name' was supplied, assume that the supplied stream does not contain
@@ -571,6 +597,8 @@ error:
 	uci_fixup_section(ctx, ctx->pctx->section);
 	if (package)
 		*package = pctx->package;
+	if (pctx->merge)
+		pctx->package = NULL;
 
 	pctx->name = NULL;
 	uci_switch_config(ctx);
@@ -718,7 +746,8 @@ static void uci_load_history(struct uci_context *ctx, struct uci_package *p, boo
 
 	UCI_TRAP_SAVE(ctx, done);
 	f = uci_open_stream(ctx, filename, SEEK_SET, flush, false);
-	uci_parse_history(ctx, f, p);
+	if (p)
+		uci_parse_history(ctx, f, p);
 	UCI_TRAP_RESTORE(ctx);
 
 done:
@@ -733,6 +762,18 @@ done:
 }
 
 
+static char *uci_config_path(struct uci_context *ctx, const char *name)
+{
+	char *filename;
+
+	if (strchr(name, '/'))
+		UCI_THROW(ctx, UCI_ERR_INVAL);
+	filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2);
+	sprintf(filename, UCI_CONFDIR "/%s", name);
+
+	return filename;
+}
+
 int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
 {
 	char *filename;
@@ -740,7 +781,6 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
 	FILE *file = NULL;
 
 	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, name != NULL);
 
 	switch (name[0]) {
 	case '.':
@@ -756,10 +796,8 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
 		break;
 	default:
 		/* config in /etc/config */
-		if (strchr(name, '/'))
-			UCI_THROW(ctx, UCI_ERR_INVAL);
-		filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2);
-		sprintf(filename, UCI_CONFDIR "/%s", name);
+		UCI_ASSERT(ctx, uci_validate_name(name));
+		filename = uci_config_path(ctx, name);
 		confdir = true;
 		break;
 	}
@@ -767,7 +805,7 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
 	file = uci_open_stream(ctx, filename, SEEK_SET, false, false);
 	ctx->errno = 0;
 	UCI_TRAP_SAVE(ctx, done);
-	uci_import(ctx, file, name, package, true);
+	UCI_INTERNAL(uci_import, ctx, file, name, package, true);
 	UCI_TRAP_RESTORE(ctx);
 
 	if (*package) {
@@ -797,7 +835,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 	 * does not modify the uci_package pointer
 	 */
 	if (!p->confdir)
-		return uci_commit(ctx, &p);
+		return uci_commit(ctx, &p, false);
 
 	if (uci_list_empty(&p->history))
 		return 0;
@@ -839,7 +877,7 @@ done:
 	return 0;
 }
 
-int uci_commit(struct uci_context *ctx, struct uci_package **package)
+int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite)
 {
 	struct uci_package *p;
 	FILE *f = NULL;
@@ -851,7 +889,13 @@ int uci_commit(struct uci_context *ctx, struct uci_package **package)
 	p = *package;
 
 	UCI_ASSERT(ctx, p != NULL);
-	UCI_ASSERT(ctx, p->path != NULL);
+	if (!p->path) {
+		if (overwrite)
+			p->path = uci_config_path(ctx, p->e.name);
+		else
+			UCI_THROW(ctx, UCI_ERR_INVAL);
+	}
+
 
 	/* open the config file for writing now, so that it is locked */
 	f = uci_open_stream(ctx, p->path, SEEK_SET, true, true);
@@ -859,23 +903,28 @@ int uci_commit(struct uci_context *ctx, struct uci_package **package)
 	/* flush unsaved changes and reload from history file */
 	UCI_TRAP_SAVE(ctx, done);
 	if (p->confdir) {
-		name = uci_strdup(ctx, p->e.name);
-		path = uci_strdup(ctx, p->path);
-		if (!uci_list_empty(&p->history))
-			UCI_INTERNAL(uci_save, ctx, p);
-		uci_free_package(&p);
-		uci_file_cleanup(ctx);
-		UCI_INTERNAL(uci_import, ctx, f, name, &p, true);
-
-		p->path = path;
-		p->confdir = true;
-		*package = p;
-
-		/* freed together with the uci_package */
-		path = NULL;
-
-		/* check for updated history, just in case */
-		uci_load_history(ctx, p, true);
+		if (!overwrite) {
+			name = uci_strdup(ctx, p->e.name);
+			path = uci_strdup(ctx, p->path);
+			if (!uci_list_empty(&p->history))
+				UCI_INTERNAL(uci_save, ctx, p);
+			uci_free_package(&p);
+			uci_file_cleanup(ctx);
+			UCI_INTERNAL(uci_import, ctx, f, name, &p, true);
+
+			p->path = path;
+			p->confdir = true;
+			*package = p;
+
+			/* freed together with the uci_package */
+			path = NULL;
+
+			/* check for updated history, just in case */
+			uci_load_history(ctx, p, true);
+		} else {
+			/* flush history */
+			uci_load_history(ctx, NULL, true);
+		}
 	}
 
 	rewind(f);