X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=23ea9595974826c8a8cf85fb37909794c12d4a00;hp=eb05d25859f773c32ee7ce6b4f4a0f5aea2d0dc7;hb=28caa37a5d52cdf2a99201c32a9ccba59661a1af;hpb=fb83e2b2dd376186833207f2877c676c1c6764d1

diff --git a/file.c b/file.c
index eb05d25..23ea959 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>
@@ -266,7 +268,7 @@ static void assert_eol(struct uci_context *ctx, char **str)
 	char *tmp;
 
 	tmp = next_arg(ctx, str, false, false);
-	if (tmp && *tmp)
+	if (tmp && *tmp && (ctx->flags & UCI_FLAG_STRICT))
 		uci_parse_error(ctx, *str, "too many arguments");
 }
 
@@ -373,7 +375,6 @@ 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_parse_context *pctx = ctx->pctx;
-	struct uci_section *s;
 	char *name = NULL;
 	char *type = NULL;
 
@@ -392,9 +393,14 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 	name = next_arg(ctx, str, false, true);
 	assert_eol(ctx, str);
 
-	if (pctx->merge)
-		UCI_INTERNAL(uci_set, ctx, pctx->package, name, NULL, type);
-	else
+	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);
 }
 
@@ -417,9 +423,14 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
 	value = next_arg(ctx, str, true, false);
 	assert_eol(ctx, str);
 
-	if (pctx->merge)
-		UCI_INTERNAL(uci_set, ctx, pctx->package, pctx->section->e.name, name, value);
-	else
+	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);
 }
 
@@ -514,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) {
@@ -565,8 +576,10 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	 * the appropriate 'package <name>' string to specify the config name
 	 * NB: the config file can still override the package name
 	 */
-	if (name)
+	if (name) {
+		UCI_ASSERT(ctx, uci_validate_name(name));
 		pctx->name = name;
+	}
 
 	while (!feof(pctx->file)) {
 		uci_getln(ctx, 0);
@@ -586,6 +599,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);
@@ -669,14 +684,14 @@ static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
 	}
 
 	UCI_INTERNAL(uci_parse_tuple, ctx, buf, &package, &section, &option, &value);
-	if (!package || !section || (!delete && !value))
-		goto error;
-	if (strcmp(package, p->e.name) != 0)
+	if (!package || (strcmp(package, p->e.name) != 0))
 		goto error;
 	if (!uci_validate_name(section))
 		goto error;
 	if (option && !uci_validate_name(option))
 		goto error;
+	if ((rename || !delete) && !uci_validate_name(value))
+		goto error;
 
 	if (rename)
 		UCI_INTERNAL(uci_rename, ctx, p, section, option, value);
@@ -728,12 +743,14 @@ static void uci_load_history(struct uci_context *ctx, struct uci_package *p, boo
 
 	if (!p->confdir)
 		return;
+
 	if ((asprintf(&filename, "%s/%s", UCI_SAVEDIR, p->e.name) < 0) || !filename)
 		UCI_THROW(ctx, UCI_ERR_MEM);
 
 	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:
@@ -748,6 +765,17 @@ done:
 }
 
 
+static char *uci_config_path(struct uci_context *ctx, const char *name)
+{
+	char *filename;
+
+	UCI_ASSERT(ctx, uci_validate_name(name));
+	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;
@@ -755,7 +783,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, uci_validate_name(name));
 
 	switch (name[0]) {
 	case '.':
@@ -771,10 +798,7 @@ 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);
+		filename = uci_config_path(ctx, name);
 		confdir = true;
 		break;
 	}
@@ -812,7 +836,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;
@@ -854,7 +878,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;
@@ -866,7 +890,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);
@@ -874,23 +904,34 @@ 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);
+			/* dump our own changes to the history file */
+			if (!uci_list_empty(&p->history))
+				UCI_INTERNAL(uci_save, ctx, p);
+
+			/* 
+			 * other processes might have modified the config 
+			 * as well. dump and reload 
+			 */
+			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);