X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=980189fd1edf7597fa161e3ae2c5603851c07519;hp=8ab40d983f8062dd6509bca17300cc41d8fe9ccf;hb=3d22ffb838d306fc87c3701fa79a2d4198a4720d;hpb=f28700454e3f5dc5d32c6d76d7104b51eca50a7b

diff --git a/file.c b/file.c
index 8ab40d9..980189f 100644
--- a/file.c
+++ b/file.c
@@ -27,6 +27,15 @@
 #define LINEBUF	32
 #define LINEBUF_MAX	4096
 
+static void uci_parse_error(struct uci_context *ctx, char *pos, char *reason)
+{
+	struct uci_parse_context *pctx = ctx->pctx;
+
+	pctx->reason = reason;
+	pctx->byte = pos - pctx->buf;
+	UCI_THROW(ctx, UCI_ERR_PARSE);
+}
+
 /*
  * Fetch a new line from the input stream and resize buffer if necessary
  */
@@ -57,11 +66,8 @@ static void uci_getln(struct uci_context *ctx, int offset)
 			return;
 		}
 
-		if (pctx->bufsz > LINEBUF_MAX/2) {
-			pctx->reason = "line too long";
-			pctx->byte = LINEBUF_MAX;
-			UCI_THROW(ctx, UCI_ERR_PARSE);
-		}
+		if (pctx->bufsz > LINEBUF_MAX/2)
+			uci_parse_error(ctx, p, "line too long");
 
 		pctx->bufsz *= 2;
 		pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
@@ -87,12 +93,10 @@ 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);
-	if (pctx->file)
-		fclose(pctx->file);
 
 	free(pctx);
 }
@@ -166,9 +170,7 @@ static void parse_double_quote(struct uci_context *ctx, char **str, char **targe
 			break;
 		}
 	}
-	ctx->pctx->reason = "unterminated \"";
-	ctx->pctx->byte = *str - ctx->pctx->buf;
-	UCI_THROW(ctx, UCI_ERR_PARSE);
+	uci_parse_error(ctx, *str, "unterminated \"");
 }
 
 /*
@@ -190,9 +192,7 @@ static void parse_single_quote(struct uci_context *ctx, char **str, char **targe
 			addc(target, str);
 		}
 	}
-	ctx->pctx->reason = "unterminated '";
-	ctx->pctx->byte = *str - ctx->pctx->buf;
-	UCI_THROW(ctx, UCI_ERR_PARSE);
+	uci_parse_error(ctx, *str, "unterminated '");
 }
 
 /*
@@ -236,7 +236,7 @@ done:
 /*
  * extract the next argument from the command line
  */
-static char *next_arg(struct uci_context *ctx, char **str, bool required)
+static char *next_arg(struct uci_context *ctx, char **str, bool required, bool name)
 {
 	char *val;
 	char *ptr;
@@ -244,11 +244,10 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required)
 	val = ptr = *str;
 	skip_whitespace(ctx, str);
 	parse_str(ctx, str, &ptr);
-	if (required && !*val) {
-		ctx->pctx->reason = "insufficient arguments";
-		ctx->pctx->byte = *str - ctx->pctx->buf;
-		UCI_THROW(ctx, UCI_ERR_PARSE);
-	}
+	if (required && !*val)
+		uci_parse_error(ctx, *str, "insufficient arguments");
+	if (name && !uci_validate_name(val))
+		uci_parse_error(ctx, val, "invalid character in field");
 
 	return val;
 }
@@ -261,12 +260,9 @@ static void assert_eol(struct uci_context *ctx, char **str)
 {
 	char *tmp;
 
-	tmp = next_arg(ctx, str, false);
-	if (tmp && *tmp) {
-		ctx->pctx->reason = "too many arguments";
-		ctx->pctx->byte = tmp - ctx->pctx->buf;
-		UCI_THROW(ctx, UCI_ERR_PARSE);
-	}
+	tmp = next_arg(ctx, str, false, false);
+	if (tmp && *tmp)
+		uci_parse_error(ctx, *str, "too many arguments");
 }
 
 /* 
@@ -297,29 +293,27 @@ static void uci_switch_config(struct uci_context *ctx)
 	 * if an older config under the same name exists, unload it
 	 * ignore errors here, e.g. if the config was not found
 	 */
-	UCI_TRAP_SAVE(ctx, ignore);
 	e = uci_lookup_list(ctx, &ctx->root, name);
 	if (e)
-		uci_unload(ctx, uci_to_package(e));
-	UCI_TRAP_RESTORE(ctx);
-ignore:
-	ctx->errno = 0;
-
+		UCI_THROW(ctx, UCI_ERR_DUPLICATE);
 	pctx->package = uci_alloc_package(ctx, name);
 }
 
 /*
  * parse the 'package' uci command (next config package)
  */
-static void uci_parse_package(struct uci_context *ctx, char **str)
+static void uci_parse_package(struct uci_context *ctx, char **str, bool single)
 {
 	char *name = NULL;
 
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
 
-	name = next_arg(ctx, str, true);
+	name = next_arg(ctx, str, true, true);
 	assert_eol(ctx, str);
+	if (single)
+		return;
+
 	ctx->pctx->name = name;
 	uci_switch_config(ctx);
 }
@@ -333,19 +327,17 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 	char *type = NULL;
 
 	if (!ctx->pctx->package) {
-		if (!ctx->pctx->name) {
-			ctx->pctx->byte = *str - ctx->pctx->buf;
-			ctx->pctx->reason = "attempting to import a file without a package name";
-			UCI_THROW(ctx, UCI_ERR_PARSE);
-		}
+		if (!ctx->pctx->name)
+			uci_parse_error(ctx, *str, "attempting to import a file without a package name");
+
 		uci_switch_config(ctx);
 	}
 
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
 
-	type = next_arg(ctx, str, true);
-	name = next_arg(ctx, str, false);
+	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);
 }
@@ -358,16 +350,14 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
 	char *name = NULL;
 	char *value = NULL;
 
-	if (!ctx->pctx->section) {
-		ctx->pctx->byte = *str - ctx->pctx->buf;
-		ctx->pctx->reason = "option command found before the first section";
-		UCI_THROW(ctx, UCI_ERR_PARSE);
-	}
+	if (!ctx->pctx->section)
+		uci_parse_error(ctx, *str, "option command found before the first section");
+
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
 
-	name = next_arg(ctx, str, true);
-	value = next_arg(ctx, str, true);
+	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);
 }
@@ -376,7 +366,7 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
 /*
  * parse a complete input line, split up combined commands by ';'
  */
-static void uci_parse_line(struct uci_context *ctx)
+static void uci_parse_line(struct uci_context *ctx, bool single)
 {
 	struct uci_parse_context *pctx = ctx->pctx;
 	char *word, *brk = NULL;
@@ -391,7 +381,7 @@ static void uci_parse_line(struct uci_context *ctx)
 		switch(word[0]) {
 			case 'p':
 				if ((word[1] == 0) || !strcmp(word + 1, "ackage"))
-					uci_parse_package(ctx, &word);
+					uci_parse_package(ctx, &word, single);
 				break;
 			case 'c':
 				if ((word[1] == 0) || !strcmp(word + 1, "onfig"))
@@ -402,9 +392,7 @@ static void uci_parse_line(struct uci_context *ctx)
 					uci_parse_option(ctx, &word);
 				break;
 			default:
-				pctx->reason = "unterminated command";
-				pctx->byte = word - pctx->buf;
-				UCI_THROW(ctx, UCI_ERR_PARSE);
+				uci_parse_error(ctx, word, "unterminated command");
 				break;
 		}
 	}
@@ -460,7 +448,8 @@ static void uci_export_package(struct uci_package *p, FILE *stream, bool header)
 	struct uci_context *ctx = p->ctx;
 	struct uci_element *s, *o;
 
-	fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name));
+	if (header)
+		fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name));
 	uci_foreach_element(&p->sections, s) {
 		struct uci_section *sec = uci_to_section(s);
 		fprintf(stream, "\nconfig '%s'", uci_escape(ctx, sec->type));
@@ -481,19 +470,18 @@ int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *packag
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, stream != NULL);
 
-	if (package) {
+	if (package)
 		uci_export_package(package, stream, header);
-		goto done;
+	else {
+		uci_foreach_element(&ctx->root, e) {
+			uci_export_package(uci_to_package(e), stream, header);
+		}
 	}
 
-	uci_foreach_element(&ctx->root, e) {
-		uci_export_package(uci_to_package(e), stream, header);
-	}
-done:
 	return 0;
 }
 
-int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package)
+int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single)
 {
 	struct uci_parse_context *pctx;
 
@@ -514,8 +502,17 @@ 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);
+			uci_parse_line(ctx, single);
+		UCI_TRAP_RESTORE(ctx);
+		continue;
+error:
+		if (ctx->flags & UCI_FLAG_PERROR)
+			uci_perror(ctx, NULL);
+		if ((ctx->errno != UCI_ERR_PARSE) ||
+			(ctx->flags & UCI_FLAG_STRICT))
+			UCI_THROW(ctx, ctx->errno);
 	}
 
 	if (package)
@@ -530,103 +527,310 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	return 0;
 }
 
-int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
+/*
+ * open a stream and go to the right position
+ *
+ * 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, 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, mode, UCI_FILEMODE);
+	if (fd <= 0)
+		goto error;
+
+	if (flock(fd, (write ? LOCK_EX : LOCK_SH)) < 0)
+		goto error;
+
+	ret = lseek(fd, 0, pos);
+
+	if (ret < 0)
+		goto error;
+
+	file = fdopen(fd, (write ? "w+" : "r"));
+	if (file)
+		goto done;
+
+error:
+	UCI_THROW(ctx, UCI_ERR_IO);
+done:
+	return file;
+}
+
+static void uci_close_stream(FILE *stream)
+{
+	int fd;
+
+	if (!stream)
+		return;
+
+	fd = fileno(stream);
+	flock(fd, LOCK_UN);
+	fclose(stream);
+}
+
+static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *p, char *buf)
+{
+	bool delete = false;
+	char *package = NULL;
+	char *section = NULL;
+	char *option = NULL;
+	char *value = NULL;
+
+	if (buf[0] == '-') {
+		delete = true;
+		buf++;
+	}
+
+	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)
+		goto error;
+	if (!uci_validate_name(section))
+		goto error;
+	if (option && !uci_validate_name(option))
+		goto error;
+
+	if (delete)
+		UCI_INTERNAL(uci_del, ctx, p, section, option);
+	else
+		UCI_INTERNAL(uci_set, ctx, p, section, option, value);
+
+	return;
+error:
+	UCI_THROW(ctx, UCI_ERR_PARSE);
+}
+
+static void uci_parse_history(struct uci_context *ctx, FILE *stream, struct uci_package *p)
+{
+	struct uci_parse_context *pctx;
+
+	/* make sure no memory from previous parse attempts is leaked */
+	uci_file_cleanup(ctx);
+
+	pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
+	ctx->pctx = pctx;
+	pctx->file = 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, bool flush)
+{
+	char *filename = NULL;
+	FILE *f = NULL;
+
+	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);
+	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;
 	bool confdir;
-	FILE *file;
-	int fd;
+	FILE *file = NULL;
 
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, name != NULL);
 
 	switch (name[0]) {
 	case '.':
+		/* relative path outside of /etc/config */
 		if (name[1] != '/')
 			UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 		/* fall through */
 	case '/':
-		/* absolute/relative path outside of /etc/config */
+		/* absolute path outside of /etc/config */
 		filename = uci_strdup(ctx, name);
 		name = strrchr(name, '/') + 1;
 		confdir = false;
 		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);
 		confdir = true;
 		break;
 	}
 
-	if ((stat(filename, &statbuf) < 0) ||
-		((statbuf.st_mode &  S_IFMT) != S_IFREG)) {
-		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	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_TRAP_RESTORE(ctx);
+
+	if (*package) {
+		(*package)->path = filename;
+		(*package)->confdir = confdir;
+		uci_load_history(ctx, *package, false);
 	}
 
-	fd = open(filename, O_RDONLY);
-	if (fd <= 0)
-		UCI_THROW(ctx, UCI_ERR_IO);
+done:
+	uci_close_stream(file);
+	return ctx->errno;
+}
 
-	if (flock(fd, LOCK_SH) < 0)
-		UCI_THROW(ctx, UCI_ERR_IO);
+int uci_save(struct uci_context *ctx, struct uci_package *p)
+{
+	FILE *f = NULL;
+	char *filename = NULL;
+	struct uci_element *e, *tmp;
 
-	file = fdopen(fd, "r");
-	if (!file)
-		UCI_THROW(ctx, UCI_ERR_IO);
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, p != NULL);
+
+	/* 
+	 * if the config file was outside of the /etc/config path,
+	 * don't save the history to a file, update the real file
+	 * directly.
+	 * does not modify the uci_package pointer
+	 */
+	if (!p->confdir)
+		return uci_commit(ctx, &p);
+
+	if (uci_list_empty(&p->history))
+		return 0;
+
+	if ((asprintf(&filename, "%s/%s", UCI_SAVEDIR, p->e.name) < 0) || !filename)
+		UCI_THROW(ctx, UCI_ERR_MEM);
 
 	ctx->errno = 0;
 	UCI_TRAP_SAVE(ctx, done);
-	uci_import(ctx, file, name, package);
+	f = uci_open_stream(ctx, filename, SEEK_END, true, true);
 	UCI_TRAP_RESTORE(ctx);
 
-	if (*package) {
-		(*package)->path = filename;
-		(*package)->confdir = confdir;
+	uci_foreach_element_safe(&p->history, tmp, e) {
+		struct uci_history *h = uci_to_history(e);
+
+		if (h->cmd == UCI_CMD_REMOVE)
+			fprintf(f, "-");
+
+		fprintf(f, "%s.%s", p->e.name, h->section);
+		if (e->name)
+			fprintf(f, ".%s", e->name);
+
+		if (h->cmd == UCI_CMD_REMOVE)
+			fprintf(f, "\n");
+		else
+			fprintf(f, "=%s\n", h->value);
+		uci_free_history(h);
 	}
 
 done:
-	flock(fd, LOCK_UN);
-	fclose(file);
-	return ctx->errno;
+	uci_close_stream(f);
+	if (filename)
+		free(filename);
+	if (ctx->errno)
+		UCI_THROW(ctx, ctx->errno);
+
+	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;
-	int fd = 0;
-	int err = UCI_ERR_IO;
+	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);
 
-	fd = open(p->path, O_RDWR);
-	if (fd < 0)
-		goto done;
+	/* open the config file for writing now, so that it is locked */
+	f = uci_open_stream(ctx, p->path, SEEK_SET, true, true);
 
-	if (flock(fd, LOCK_EX) < 0)
-		goto done;
+	/* 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);
+	}
 
-	ftruncate(fd, 0);
-	f = fdopen(fd, "w");
-	if (!f)
-		goto done;
+	rewind(f);
+	ftruncate(fileno(f), 0);
 
-	UCI_TRAP_SAVE(ctx, done);
 	uci_export(ctx, f, p, false);
 	UCI_TRAP_RESTORE(ctx);
 
 done:
-	if (f)
-		fclose(f);
-	else if (fd > 0)
-		close(fd);
-
+	if (name)
+		free(name);
+	if (path)
+		free(path);
+	uci_close_stream(f);
 	if (ctx->errno)
 		UCI_THROW(ctx, ctx->errno);
-	if (err)
-		UCI_THROW(ctx, UCI_ERR_IO);
+
 	return 0;
 }
 
@@ -648,15 +852,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++) {
@@ -669,11 +875,7 @@ char **uci_list_configs(struct uci_context *ctx)
 		size += strlen(p) + 1;
 	}
 
-	configs = malloc(size);
-	if (!configs)
-		return NULL;
-
-	memset(configs, 0, size);
+	configs = uci_malloc(ctx, size);
 	buf = (char *) &configs[globbuf.gl_pathc + 1];
 	for(i = 0; i < globbuf.gl_pathc; i++) {
 		char *p;
@@ -686,7 +888,8 @@ char **uci_list_configs(struct uci_context *ctx)
 		strcpy(buf, p);
 		buf += strlen(buf) + 1;
 	}
-	return configs;
-}
+	*list = configs;
 
+	return 0;
+}