X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=file.c;h=76f7f322afbd4e9575d75fd0774643a184c637d9;hb=df72af474075159ab79ed190d2109eb2d86709bf;hp=81047a48352ddbb836d55c7a01611fd2cd5adce5;hpb=556215152a216c179fe2ca7db9b1de7036ceda60;p=project%2Fuci.git

diff --git a/file.c b/file.c
index 81047a4..76f7f32 100644
--- a/file.c
+++ b/file.c
@@ -33,7 +33,6 @@
 #include "uci_internal.h"
 
 #define LINEBUF	32
-#define LINEBUF_MAX	4096
 
 /*
  * Fetch a new line from the input stream and resize buffer if necessary
@@ -69,11 +68,10 @@ __private void uci_getln(struct uci_context *ctx, int offset)
 			return;
 		}
 
-		if (pctx->bufsz > LINEBUF_MAX/2)
-			uci_parse_error(ctx, "line too long");
-
 		pctx->bufsz *= 2;
 		pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
+		if (!pctx->buf)
+			UCI_THROW(ctx, UCI_ERR_MEM);
 	} while (1);
 }
 
@@ -290,6 +288,27 @@ int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char *
 	return 0;
 }
 
+/*
+ * Fixup sections functions does the fixup of all sections for given package.
+ * It is used as a preprocessing step for fixing up existing anonymous sections
+ * from configurations.
+ *
+ * It uses uci_fixup_section() from list.c and then adds delta changes.
+ */
+static void
+uci_fixup_sections(struct uci_context *ctx, struct uci_package *p)
+{
+	struct uci_element *e;
+	struct uci_section *s;
+
+	uci_foreach_element(&p->sections, e) {
+		s = uci_to_section(e);
+		s->package->name_index++;
+		uci_fixup_section(ctx, s);
+		s->anonymous = false;
+	}
+}
+
 static int
 uci_fill_ptr(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_element *e)
 {
@@ -412,7 +431,6 @@ static void uci_parse_config(struct uci_context *ctx)
 	char *name;
 	char *type;
 
-	uci_fixup_section(ctx, ctx->pctx->section);
 	if (!ctx->pctx->package) {
 		if (!ctx->pctx->name)
 			uci_parse_error(ctx, "attempting to import a file without a package name");
@@ -439,8 +457,13 @@ static void uci_parse_config(struct uci_context *ctx)
 	} else {
 		uci_fill_ptr(ctx, &ptr, &pctx->package->e);
 		e = uci_lookup_list(&pctx->package->sections, name);
-		if (e)
+		if (e) {
 			ptr.s = uci_to_section(e);
+
+			if ((ctx->flags & UCI_FLAG_STRICT) && strcmp(ptr.s->type, type))
+				uci_parse_error(ctx, "section of different type overwrites prior section with same name");
+		}
+
 		ptr.section = name;
 		ptr.value = type;
 
@@ -603,8 +626,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 || (ctx->flags & UCI_FLAG_EXPORT_NAME))
-			fprintf(stream, " '%s'", uci_escape(ctx, sec->e.name));
+		fprintf(stream, " '%s'", uci_escape(ctx, sec->e.name));
 		fprintf(stream, "\n");
 		uci_foreach_element(&sec->options, o) {
 			struct uci_option *opt = uci_to_option(o);
@@ -688,7 +710,6 @@ error:
 			UCI_THROW(ctx, ctx->err);
 	}
 
-	uci_fixup_section(ctx, ctx->pctx->section);
 	if (!pctx->package && name)
 		uci_switch_config(ctx);
 	if (package)
@@ -696,6 +717,7 @@ error:
 	if (pctx->merge)
 		pctx->package = NULL;
 
+	uci_fixup_sections(ctx, *package);
 	pctx->name = NULL;
 	uci_switch_config(ctx);
 
@@ -737,17 +759,6 @@ static void uci_file_commit(struct uci_context *ctx, struct uci_package **packag
 	if ((asprintf(&filename, "%s/.%s.uci-XXXXXX", ctx->confdir, p->e.name) < 0) || !filename)
 		UCI_THROW(ctx, UCI_ERR_MEM);
 
-	if (!mktemp(filename))
-		*filename = 0;
-
-	if (!*filename) {
-		free(filename);
-		UCI_THROW(ctx, UCI_ERR_IO);
-	}
-
-	if ((stat(filename, &statbuf) == 0) && ((statbuf.st_mode & S_IFMT) != S_IFREG))
-		UCI_THROW(ctx, UCI_ERR_IO);
-
 	/* open the config file for writing now, so that it is locked */
 	f1 = uci_open_stream(ctx, p->path, NULL, SEEK_SET, true, true);
 
@@ -782,6 +793,17 @@ static void uci_file_commit(struct uci_context *ctx, struct uci_package **packag
 			goto done;
 	}
 
+	if (!mktemp(filename))
+		*filename = 0;
+
+	if (!*filename) {
+		free(filename);
+		UCI_THROW(ctx, UCI_ERR_IO);
+	}
+
+	if ((stat(filename, &statbuf) == 0) && ((statbuf.st_mode & S_IFMT) != S_IFREG))
+		UCI_THROW(ctx, UCI_ERR_IO);
+
 	f2 = uci_open_stream(ctx, filename, p->path, SEEK_SET, true, true);
 	uci_export(ctx, f2, p, false);
 
@@ -797,12 +819,15 @@ done:
 	free(name);
 	free(path);
 	uci_close_stream(f1);
-	if (do_rename && rename(filename, p->path)) {
-		unlink(filename);
-		UCI_THROW(ctx, UCI_ERR_IO);
+	if (do_rename) {
+		path = realpath(p->path, NULL);
+		if (!path || rename(filename, path)) {
+			unlink(filename);
+			UCI_THROW(ctx, UCI_ERR_IO);
+		}
+		free(path);
 	}
 	free(filename);
-	sync();
 	if (ctx->err)
 		UCI_THROW(ctx, ctx->err);
 }
@@ -878,6 +903,7 @@ static struct uci_package *uci_file_load(struct uci_context *ctx, const char *na
 	char *filename;
 	bool confdir;
 	FILE *file = NULL;
+	size_t n_change;
 
 	switch (name[0]) {
 	case '.':
@@ -907,7 +933,8 @@ static struct uci_package *uci_file_load(struct uci_context *ctx, const char *na
 	if (package) {
 		package->path = filename;
 		package->has_delta = confdir;
-		uci_load_delta(ctx, package, false);
+		n_change = uci_load_delta(ctx, package, false);
+		package->name_index += n_change;
 	}
 
 done: