X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=eb05d25859f773c32ee7ce6b4f4a0f5aea2d0dc7;hp=be63247be7da3eec4d5c7472168bd30b7d506ba3;hb=05cf670dde3610279a07b76277cc29ceb4d7ad00;hpb=b7c461d025b6db1f9c3e0ce137863d9f912cdbfa

diff --git a/file.c b/file.c
index be63247..eb05d25 100644
--- a/file.c
+++ b/file.c
@@ -93,7 +93,7 @@ static void uci_file_cleanup(struct uci_context *ctx)
 
 	ctx->pctx = NULL;
 	if (pctx->package)
-		uci_free_package(pctx->package);
+		uci_free_package(&pctx->package);
 
 	if (pctx->buf)
 		free(pctx->buf);
@@ -244,11 +244,16 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required, bool n
 	val = ptr = *str;
 	skip_whitespace(ctx, str);
 	parse_str(ctx, str, &ptr);
-	if (required && !*val)
-		uci_parse_error(ctx, *str, "insufficient arguments");
+	if (!*val) {
+		if (required)
+			uci_parse_error(ctx, *str, "insufficient arguments");
+		goto done;
+	}
+
 	if (name && !uci_validate_name(val))
 		uci_parse_error(ctx, val, "invalid character in field");
 
+done:
 	return val;
 }
 
@@ -318,14 +323,61 @@ static void uci_parse_package(struct uci_context *ctx, char **str, bool single)
 	uci_switch_config(ctx);
 }
 
+/* Based on an efficient hash function published by D. J. Bernstein */
+static unsigned int djbhash(unsigned int hash, char *str)
+{
+	int len = strlen(str);
+	int i;
+
+	/* initial value */
+	if (hash == ~0)
+		hash = 5381;
+
+	for(i = 0; i < len; i++) {
+		hash = ((hash << 5) + hash) + str[i];
+	}
+	return (hash & 0x7FFFFFFF);
+}
+
+/* fix up an unnamed section */
+static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
+{
+	unsigned int hash = ~0;
+	struct uci_element *e;
+	char buf[16];
+
+	if (!s || s->e.name)
+		return;
+
+	/*
+	 * Generate a name for unnamed sections. This is used as reference
+	 * when locating or updating the section from apps/scripts.
+	 * To make multiple concurrent versions somewhat safe for updating,
+	 * the name is generated from a hash of its type and name/value
+	 * pairs of its option, and it is prefixed by a counter value.
+	 * If the order of the unnamed sections changes for some reason,
+	 * updates to them will be rejected.
+	 */
+	hash = djbhash(hash, s->type);
+	uci_foreach_element(&s->options, e) {
+		hash = djbhash(hash, e->name);
+		hash = djbhash(hash, uci_to_option(e)->value);
+	}
+	sprintf(buf, "cfg%02x%04x", ++s->package->n_section, hash % (1 << 16));
+	s->e.name = uci_strdup(ctx, buf);
+}
+
 /*
  * parse the 'config' uci command (open a section)
  */
 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;
 
+	uci_fixup_section(ctx, ctx->pctx->section);
 	if (!ctx->pctx->package) {
 		if (!ctx->pctx->name)
 			uci_parse_error(ctx, *str, "attempting to import a file without a package name");
@@ -339,7 +391,11 @@ 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_INTERNAL(uci_set, ctx, pctx->package, name, NULL, type);
+	else
+		pctx->section = uci_alloc_section(pctx->package, type, name);
 }
 
 /*
@@ -347,10 +403,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 */
@@ -359,7 +416,11 @@ 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_INTERNAL(uci_set, ctx, pctx->package, pctx->section->e.name, name, value);
+	else
+		uci_alloc_option(pctx->section, name, value);
 }
 
 
@@ -453,7 +514,9 @@ 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));
-		fprintf(stream, " '%s'\n", uci_escape(ctx, sec->e.name));
+		if (!sec->anonymous)
+			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);
 			fprintf(stream, "\toption '%s'", uci_escape(ctx, opt->e.name));
@@ -484,6 +547,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);
@@ -491,6 +555,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
@@ -502,7 +570,6 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 
 	while (!feof(pctx->file)) {
 		uci_getln(ctx, 0);
-
 		UCI_TRAP_SAVE(ctx, error);
 		if (pctx->buf[0])
 			uci_parse_line(ctx, single);
@@ -516,6 +583,7 @@ error:
 			UCI_THROW(ctx, ctx->errno);
 	}
 
+	uci_fixup_section(ctx, ctx->pctx->section);
 	if (package)
 		*package = pctx->package;
 
@@ -534,33 +602,34 @@ error:
  * note: when opening for write and seeking to the beginning of
  * the stream, truncate the file
  */
-static FILE *uci_open_stream(struct uci_context *ctx, const char *filename, int pos, bool write)
+static FILE *uci_open_stream(struct uci_context *ctx, const char *filename, int pos, bool write, bool create)
 {
 	struct stat statbuf;
 	FILE *file = NULL;
 	int fd, ret;
+	int mode = (write ? O_RDWR : O_RDONLY);
+
+	if (create)
+		mode |= O_CREAT;
 
 	if (!write && ((stat(filename, &statbuf) < 0) ||
 		((statbuf.st_mode &  S_IFMT) != S_IFREG))) {
 		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 	}
 
-	fd = open(filename, (write ? O_RDWR | O_CREAT : O_RDONLY));
+	fd = open(filename, mode, UCI_FILEMODE);
 	if (fd <= 0)
 		goto error;
 
 	if (flock(fd, (write ? LOCK_EX : LOCK_SH)) < 0)
 		goto error;
 
-	if (write && (pos == SEEK_SET))
-		ret = ftruncate(fd, 0);
-	else
-		ret = lseek(fd, 0, pos);
+	ret = lseek(fd, 0, pos);
 
 	if (ret < 0)
 		goto error;
 
-	file = fdopen(fd, (write ? "w" : "r"));
+	file = fdopen(fd, (write ? "w+" : "r"));
 	if (file)
 		goto done;
 
@@ -585,6 +654,7 @@ static void uci_close_stream(FILE *stream)
 static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *p, char *buf)
 {
 	bool delete = false;
+	bool rename = false;
 	char *package = NULL;
 	char *section = NULL;
 	char *option = NULL;
@@ -593,6 +663,9 @@ static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
 	if (buf[0] == '-') {
 		delete = true;
 		buf++;
+	} else if (buf[0] == '@') {
+		rename = true;
+		buf++;
 	}
 
 	UCI_INTERNAL(uci_parse_tuple, ctx, buf, &package, &section, &option, &value);
@@ -605,8 +678,10 @@ static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
 	if (option && !uci_validate_name(option))
 		goto error;
 
-	if (delete)
-		UCI_INTERNAL(uci_del, ctx, p, section, option);
+	if (rename)
+		UCI_INTERNAL(uci_rename, ctx, p, section, option, value);
+	else if (delete)
+		UCI_INTERNAL(uci_delete, ctx, p, section, option);
 	else
 		UCI_INTERNAL(uci_set, ctx, p, section, option, value);
 
@@ -626,19 +701,27 @@ static void uci_parse_history(struct uci_context *ctx, FILE *stream, struct uci_
 	ctx->pctx = pctx;
 	pctx->file = stream;
 
-	rewind(stream);
 	while (!feof(pctx->file)) {
 		uci_getln(ctx, 0);
 		if (!pctx->buf[0])
 			continue;
+
+		/*
+		 * ignore parse errors in single lines, we want to preserve as much
+		 * history as possible
+		 */
+		UCI_TRAP_SAVE(ctx, error);
 		uci_parse_history_line(ctx, p, pctx->buf);
+		UCI_TRAP_RESTORE(ctx);
+error:
+		continue;
 	}
 
 	/* no error happened, we can get rid of the parser context now */
 	uci_file_cleanup(ctx);
 }
 
-static void uci_load_history(struct uci_context *ctx, struct uci_package *p)
+static void uci_load_history(struct uci_context *ctx, struct uci_package *p, bool flush)
 {
 	char *filename = NULL;
 	FILE *f = NULL;
@@ -649,16 +732,22 @@ static void uci_load_history(struct uci_context *ctx, struct uci_package *p)
 		UCI_THROW(ctx, UCI_ERR_MEM);
 
 	UCI_TRAP_SAVE(ctx, done);
-	f = uci_open_stream(ctx, filename, SEEK_SET, false);
+	f = uci_open_stream(ctx, filename, SEEK_SET, flush, false);
 	uci_parse_history(ctx, f, p);
 	UCI_TRAP_RESTORE(ctx);
+
 done:
+	if (flush && f) {
+		rewind(f);
+		ftruncate(fileno(f), 0);
+	}
 	if (filename)
 		free(filename);
 	uci_close_stream(f);
 	ctx->errno = 0;
 }
 
+
 int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
 {
 	char *filename;
@@ -666,7 +755,7 @@ 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);
+	UCI_ASSERT(ctx, uci_validate_name(name));
 
 	switch (name[0]) {
 	case '.':
@@ -690,16 +779,16 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
 		break;
 	}
 
-	file = uci_open_stream(ctx, filename, SEEK_SET, false);
+	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) {
 		(*package)->path = filename;
 		(*package)->confdir = confdir;
-		uci_load_history(ctx, *package);
+		uci_load_history(ctx, *package, false);
 	}
 
 done:
@@ -719,10 +808,11 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 	/* 
 	 * if the config file was outside of the /etc/config path,
 	 * don't save the history to a file, update the real file
-	 * directly
+	 * directly.
+	 * does not modify the uci_package pointer
 	 */
 	if (!p->confdir)
-		return uci_commit(ctx, p);
+		return uci_commit(ctx, &p);
 
 	if (uci_list_empty(&p->history))
 		return 0;
@@ -732,7 +822,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 
 	ctx->errno = 0;
 	UCI_TRAP_SAVE(ctx, done);
-	f = uci_open_stream(ctx, filename, SEEK_END, true);
+	f = uci_open_stream(ctx, filename, SEEK_END, true, true);
 	UCI_TRAP_RESTORE(ctx);
 
 	uci_foreach_element_safe(&p->history, tmp, e) {
@@ -740,6 +830,8 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 
 		if (h->cmd == UCI_CMD_REMOVE)
 			fprintf(f, "-");
+		else if (h->cmd == UCI_CMD_RENAME)
+			fprintf(f, "@");
 
 		fprintf(f, "%s.%s", p->e.name, h->section);
 		if (e->name)
@@ -749,7 +841,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 			fprintf(f, "\n");
 		else
 			fprintf(f, "=%s\n", h->value);
-		uci_list_del(&e->list);
+		uci_free_history(h);
 	}
 
 done:
@@ -762,21 +854,56 @@ done:
 	return 0;
 }
 
-int uci_commit(struct uci_context *ctx, struct uci_package *p)
+int uci_commit(struct uci_context *ctx, struct uci_package **package)
 {
+	struct uci_package *p;
 	FILE *f = NULL;
+	char *name = NULL;
+	char *path = NULL;
 
 	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, package != NULL);
+	p = *package;
+
 	UCI_ASSERT(ctx, p != NULL);
 	UCI_ASSERT(ctx, p->path != NULL);
 
-	f = uci_open_stream(ctx, p->path, SEEK_SET, true);
+	/* open the config file for writing now, so that it is locked */
+	f = uci_open_stream(ctx, p->path, SEEK_SET, true, true);
 
+	/* 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);
+	}
+
+	rewind(f);
+	ftruncate(fileno(f), 0);
+
 	uci_export(ctx, f, p, false);
 	UCI_TRAP_RESTORE(ctx);
 
 done:
+	if (name)
+		free(name);
+	if (path)
+		free(path);
 	uci_close_stream(f);
 	if (ctx->errno)
 		UCI_THROW(ctx, ctx->errno);
@@ -802,15 +929,17 @@ static inline char *get_filename(char *path)
 	return p;
 }
 
-char **uci_list_configs(struct uci_context *ctx)
+int uci_list_configs(struct uci_context *ctx, char ***list)
 {
 	char **configs;
 	glob_t globbuf;
 	int size, i;
 	char *buf;
 
+	UCI_HANDLE_ERR(ctx);
+
 	if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
-		return NULL;
+		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 
 	size = sizeof(char *) * (globbuf.gl_pathc + 1);
 	for(i = 0; i < globbuf.gl_pathc; i++) {
@@ -836,6 +965,8 @@ char **uci_list_configs(struct uci_context *ctx)
 		strcpy(buf, p);
 		buf += strlen(buf) + 1;
 	}
-	return configs;
+	*list = configs;
+
+	return 0;
 }