X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=7188a90a59b902f135a0cffdc00530c07a430f7a;hp=8e7f0ce82b2a2e6790bb0e8c762833df00953f3a;hb=0a18953fa3ff8aabea37d81b434e9f577e3fbf34;hpb=4b1ddfb8358bcd57560406db26d7041c9c0cb90b

diff --git a/file.c b/file.c
index 8e7f0ce..7188a90 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;
 
@@ -524,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) {
@@ -575,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);
@@ -681,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);
@@ -740,6 +743,7 @@ 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);
 
@@ -765,8 +769,7 @@ static char *uci_config_path(struct uci_context *ctx, const char *name)
 {
 	char *filename;
 
-	if (strchr(name, '/'))
-		UCI_THROW(ctx, UCI_ERR_INVAL);
+	UCI_ASSERT(ctx, uci_validate_name(name));
 	filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2);
 	sprintf(filename, UCI_CONFDIR "/%s", name);
 
@@ -780,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 '.':