X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=04973f395655361bf9a3adede6e82d254a2a7a4c;hp=bc6b5a9fb573a45c63471fda82bf5671e4f00533;hb=31d4b691d96af442e8dfcefbb7acf85a448bba5c;hpb=907e27f8019efcb7bc6ce95ade0733102587d2dd

diff --git a/file.c b/file.c
index bc6b5a9..04973f3 100644
--- a/file.c
+++ b/file.c
@@ -9,7 +9,7 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  */
 
 /*
@@ -18,42 +18,66 @@
 
 #define _GNU_SOURCE
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/file.h>
 #include <stdbool.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <glob.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "uci.h"
+#include "uci_internal.h"
+
+#define LINEBUF	32
+#define LINEBUF_MAX	4096
 
 /*
- * Clean up all extra memory used by the parser and exporter
+ * Fetch a new line from the input stream and resize buffer if necessary
  */
-static void uci_file_cleanup(struct uci_context *ctx)
+__private void uci_getln(struct uci_context *ctx, int offset)
 {
-	struct uci_parse_context *pctx;
+	struct uci_parse_context *pctx = ctx->pctx;
+	char *p;
+	int ofs;
 
-	if (ctx->buf) {
-		free(ctx->buf);
-		ctx->buf = NULL;
-		ctx->bufsz = 0;
+	if (pctx->buf == NULL) {
+		pctx->buf = uci_malloc(ctx, LINEBUF);
+		pctx->bufsz = LINEBUF;
 	}
 
-	pctx = ctx->pctx;
-	if (!pctx)
-		return;
+	ofs = offset;
+	do {
+		p = &pctx->buf[ofs];
+		p[ofs] = 0;
+
+		p = fgets(p, pctx->bufsz - ofs, pctx->file);
+		if (!p || !*p)
+			return;
 
-	ctx->pctx = NULL;
-	if (pctx->package)
-		uci_free_package(&pctx->package);
+		ofs += strlen(p);
+		if (pctx->buf[ofs - 1] == '\n') {
+			pctx->line++;
+			if (ofs >= 2 && pctx->buf[ofs - 2] == '\r')
+				pctx->buf[ofs - 2] = 0;
+			else
+				pctx->buf[ofs - 1] = 0;
+			return;
+		}
 
-	if (pctx->buf)
-		free(pctx->buf);
+		if (pctx->bufsz > LINEBUF_MAX/2)
+			uci_parse_error(ctx, p, "line too long");
 
-	free(pctx);
+		pctx->bufsz *= 2;
+		pctx->buf = uci_realloc(ctx, pctx->buf, pctx->bufsz);
+	} while (1);
 }
 
 
-/* 
+/*
  * parse a character escaped by '\'
  * returns true if the escaped character is to be parsed
  * returns false if the escaped character is to be ignored
@@ -152,6 +176,7 @@ static void parse_single_quote(struct uci_context *ctx, char **str, char **targe
  */
 static void parse_str(struct uci_context *ctx, char **str, char **target)
 {
+	bool next = true;
 	do {
 		switch(**str) {
 		case '\'':
@@ -165,6 +190,9 @@ static void parse_str(struct uci_context *ctx, char **str, char **target)
 			/* fall through */
 		case 0:
 			goto done;
+		case ';':
+			next = false;
+			goto done;
 		case '\\':
 			if (!parse_backslash(ctx, str))
 				continue;
@@ -176,12 +204,12 @@ static void parse_str(struct uci_context *ctx, char **str, char **target)
 	} while (**str && !isspace(**str));
 done:
 
-	/* 
+	/*
 	 * if the string was unquoted and we've stopped at a whitespace
 	 * character, skip to the next one, because the whitespace will
 	 * be overwritten by a null byte here
 	 */
-	if (**str)
+	if (**str && next)
 		*str += 1;
 
 	/* terminate the parsed string */
@@ -198,7 +226,12 @@ 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(*str[0] == ';') {
+		*str[0] = 0;
+		*str += 1;
+	} else {
+		parse_str(ctx, str, &ptr);
+	}
 	if (!*val) {
 		if (required)
 			uci_parse_error(ctx, *str, "insufficient arguments");
@@ -212,6 +245,67 @@ done:
 	return val;
 }
 
+int uci_parse_argument(struct uci_context *ctx, FILE *stream, char **str, char **result)
+{
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, str != NULL);
+	UCI_ASSERT(ctx, result != NULL);
+
+	if (ctx->pctx && (ctx->pctx->file != stream))
+		uci_cleanup(ctx);
+
+	if (!ctx->pctx)
+		uci_alloc_parse_context(ctx);
+
+	ctx->pctx->file = stream;
+
+	if (!*str) {
+		uci_getln(ctx, 0);
+		*str = ctx->pctx->buf;
+	}
+
+	*result = next_arg(ctx, str, false, false);
+
+	return 0;
+}
+
+static int
+uci_fill_ptr(struct uci_context *ctx, struct uci_ptr *ptr, struct uci_element *e)
+{
+	UCI_ASSERT(ctx, ptr != NULL);
+	UCI_ASSERT(ctx, e != NULL);
+
+	memset(ptr, 0, sizeof(struct uci_ptr));
+	switch(e->type) {
+	case UCI_TYPE_OPTION:
+		ptr->o = uci_to_option(e);
+		goto fill_option;
+	case UCI_TYPE_SECTION:
+		ptr->s = uci_to_section(e);
+		goto fill_section;
+	case UCI_TYPE_PACKAGE:
+		ptr->p = uci_to_package(e);
+		goto fill_package;
+	default:
+		UCI_THROW(ctx, UCI_ERR_INVAL);
+	}
+
+fill_option:
+	ptr->option = ptr->o->e.name;
+	ptr->s = ptr->o->section;
+fill_section:
+	ptr->section = ptr->s->e.name;
+	ptr->p = ptr->s->package;
+fill_package:
+	ptr->package = ptr->p->e.name;
+
+	ptr->flags |= UCI_LOOKUP_DONE;
+
+	return 0;
+}
+
+
+
 /*
  * verify that the end of the line or command is reached.
  * throw an error if extra arguments are given on the command line
@@ -220,12 +314,13 @@ static void assert_eol(struct uci_context *ctx, char **str)
 {
 	char *tmp;
 
+	skip_whitespace(ctx, str);
 	tmp = next_arg(ctx, str, false, false);
-	if (tmp && *tmp && (ctx->flags & UCI_FLAG_STRICT))
+	if (*tmp && (ctx->flags & UCI_FLAG_STRICT))
 		uci_parse_error(ctx, *str, "too many arguments");
 }
 
-/* 
+/*
  * switch to a different config, either triggered by uci_load, or by a
  * 'package <...>' statement in the import file
  */
@@ -240,6 +335,7 @@ static void uci_switch_config(struct uci_context *ctx)
 
 	/* add the last config to main config file list */
 	if (pctx->package) {
+		pctx->package->backend = ctx->backend;
 		uci_list_add(&ctx->root, &pctx->package->e.list);
 
 		pctx->package = NULL;
@@ -249,11 +345,11 @@ static void uci_switch_config(struct uci_context *ctx)
 	if (!name)
 		return;
 
-	/* 
+	/*
 	 * if an older config under the same name exists, unload it
 	 * ignore errors here, e.g. if the config was not found
 	 */
-	e = uci_lookup_list(ctx, &ctx->root, name);
+	e = uci_lookup_list(&ctx->root, name);
 	if (e)
 		UCI_THROW(ctx, UCI_ERR_DUPLICATE);
 	pctx->package = uci_alloc_package(ctx, name);
@@ -278,56 +374,14 @@ 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_element *e;
+	struct uci_ptr ptr;
 	char *name = NULL;
 	char *type = NULL;
 
@@ -343,33 +397,41 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 	*str += strlen(*str) + 1;
 
 	type = next_arg(ctx, str, true, false);
-	if (!uci_validate_str(type, false))
+	if (!uci_validate_type(type))
 		uci_parse_error(ctx, type, "invalid character in field");
 	name = next_arg(ctx, str, false, true);
 	assert_eol(ctx, str);
 
-	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);
+	if (!name || !name[0]) {
+		ctx->internal = !pctx->merge;
+		UCI_NESTED(uci_add_section, ctx, pctx->package, type, &pctx->section);
+	} else {
+		uci_fill_ptr(ctx, &ptr, &pctx->package->e);
+		e = uci_lookup_list(&pctx->package->sections, name);
+		if (e)
+			ptr.s = uci_to_section(e);
+		ptr.section = name;
+		ptr.value = type;
+
+		ctx->internal = !pctx->merge;
+		UCI_NESTED(uci_set, ctx, &ptr);
+		pctx->section = uci_to_section(ptr.last);
+	}
 }
 
 /*
  * parse the 'option' uci command (open a value)
  */
-static void uci_parse_option(struct uci_context *ctx, char **str)
+static void uci_parse_option(struct uci_context *ctx, char **str, bool list)
 {
 	struct uci_parse_context *pctx = ctx->pctx;
+	struct uci_element *e;
+	struct uci_ptr ptr;
 	char *name = NULL;
 	char *value = NULL;
 
 	if (!pctx->section)
-		uci_parse_error(ctx, *str, "option command found before the first section");
+		uci_parse_error(ctx, *str, "option/list command found before the first section");
 
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
@@ -378,56 +440,70 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
 	value = next_arg(ctx, str, false, false);
 	assert_eol(ctx, str);
 
-	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);
+	uci_fill_ptr(ctx, &ptr, &pctx->section->e);
+	e = uci_lookup_list(&pctx->section->options, name);
+	if (e)
+		ptr.o = uci_to_option(e);
+	ptr.option = name;
+	ptr.value = value;
+
+	ctx->internal = !pctx->merge;
+	if (list)
+		UCI_NESTED(uci_add_list, ctx, &ptr);
+	else
+		UCI_NESTED(uci_set, ctx, &ptr);
 }
 
-
 /*
  * parse a complete input line, split up combined commands by ';'
  */
 static void uci_parse_line(struct uci_context *ctx, bool single)
 {
 	struct uci_parse_context *pctx = ctx->pctx;
-	char *word, *brk = NULL;
-
-	for (word = strtok_r(pctx->buf, ";", &brk);
-		 word;
-		 word = strtok_r(NULL, ";", &brk)) {
-
-		char *pbrk = NULL;
-		word = strtok_r(word, " \t", &pbrk);
+	char *word, *brk;
 
+	word = pctx->buf;
+	do {
+		brk = NULL;
+		word = strtok_r(word, " \t", &brk);
 		if (!word)
-			continue;
+			return;
 
 		switch(word[0]) {
+			case 0:
 			case '#':
 				return;
 			case 'p':
 				if ((word[1] == 0) || !strcmp(word + 1, "ackage"))
 					uci_parse_package(ctx, &word, single);
+				else
+					goto invalid;
 				break;
 			case 'c':
 				if ((word[1] == 0) || !strcmp(word + 1, "onfig"))
 					uci_parse_config(ctx, &word);
+				else
+					goto invalid;
 				break;
 			case 'o':
 				if ((word[1] == 0) || !strcmp(word + 1, "ption"))
-					uci_parse_option(ctx, &word);
+					uci_parse_option(ctx, &word, false);
+				else
+					goto invalid;
 				break;
-			default:
-				uci_parse_error(ctx, word, "unterminated command");
+			case 'l':
+				if ((word[1] == 0) || !strcmp(word + 1, "ist"))
+					uci_parse_option(ctx, &word, true);
+				else
+					goto invalid;
 				break;
+			default:
+				goto invalid;
 		}
-	}
+		continue;
+invalid:
+		uci_parse_error(ctx, word, "invalid command");
+	} while (1);
 }
 
 /* max number of characters that escaping adds to the string */
@@ -436,62 +512,83 @@ static void uci_parse_line(struct uci_context *ctx, bool single)
 /*
  * escape an uci string for export
  */
-static char *uci_escape(struct uci_context *ctx, char *str)
+static const char *uci_escape(struct uci_context *ctx, const char *str)
 {
-	char *s, *p;
-	int pos = 0;
+	const char *end;
+	int ofs = 0;
 
 	if (!ctx->buf) {
 		ctx->bufsz = LINEBUF;
 		ctx->buf = malloc(LINEBUF);
+
+		if (!ctx->buf)
+			return str;
 	}
 
-	s = str;
-	p = strchr(str, '\'');
-	if (!p)
-		return str;
+	while (1) {
+		int len;
 
-	do {
-		int len = p - s;
-		if (len > 0) {
-			if (p + sizeof(UCI_QUOTE_ESCAPE) - str >= ctx->bufsz) {
-				ctx->bufsz *= 2;
-				ctx->buf = realloc(ctx->buf, ctx->bufsz);
-				if (!ctx->buf)
-					UCI_THROW(ctx, UCI_ERR_MEM);
-			}
-			memcpy(&ctx->buf[pos], s, len);
-			pos += len;
+		end = strchr(str, '\'');
+		if (!end)
+			end = str + strlen(str);
+		len = end - str;
+
+		/* make sure that we have enough room in the buffer */
+		while (ofs + len + sizeof(UCI_QUOTE_ESCAPE) + 1 > ctx->bufsz) {
+			ctx->bufsz *= 2;
+			ctx->buf = uci_realloc(ctx, ctx->buf, ctx->bufsz);
 		}
-		strcpy(&ctx->buf[pos], UCI_QUOTE_ESCAPE);
-		pos += sizeof(UCI_QUOTE_ESCAPE);
-		s = p + 1;
-	} while ((p = strchr(s, '\'')));
 
+		/* copy the string until the character before the quote */
+		memcpy(&ctx->buf[ofs], str, len);
+		ofs += len;
+
+		/* end of string? return the buffer */
+		if (*end == 0)
+			break;
+
+		memcpy(&ctx->buf[ofs], UCI_QUOTE_ESCAPE, sizeof(UCI_QUOTE_ESCAPE));
+		ofs += strlen(&ctx->buf[ofs]);
+		str = end + 1;
+	}
+
+	ctx->buf[ofs] = 0;
 	return ctx->buf;
 }
 
-
 /*
  * export a single config package to a file stream
  */
 static void uci_export_package(struct uci_package *p, FILE *stream, bool header)
 {
 	struct uci_context *ctx = p->ctx;
-	struct uci_element *s, *o;
+	struct uci_element *s, *o, *i;
 
 	if (header)
-		fprintf(stream, "package '%s'\n", uci_escape(ctx, p->e.name));
+		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));
+		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, "\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));
-			fprintf(stream, " '%s'\n", uci_escape(ctx, opt->value));
+			switch(opt->type) {
+			case UCI_TYPE_STRING:
+				fprintf(stream, "\toption %s", uci_escape(ctx, opt->e.name));
+				fprintf(stream, " '%s'\n", uci_escape(ctx, opt->v.string));
+				break;
+			case UCI_TYPE_LIST:
+				uci_foreach_element(&opt->v.list, i) {
+					fprintf(stream, "\tlist %s", uci_escape(ctx, opt->e.name));
+					fprintf(stream, " '%s'\n", uci_escape(ctx, i->name));
+				}
+				break;
+			default:
+				fprintf(stream, "\t# unknown type for option '%s'\n", uci_escape(ctx, opt->e.name));
+				break;
+			}
 		}
 	}
 	fprintf(stream, "\n");
@@ -521,12 +618,12 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	UCI_HANDLE_ERR(ctx);
 
 	/* make sure no memory from previous parse attempts is leaked */
-	uci_file_cleanup(ctx);
+	uci_cleanup(ctx);
 
 	uci_alloc_parse_context(ctx);
 	pctx = ctx->pctx;
 	pctx->file = stream;
-	if (*package && single) {
+	if (package && *package && single) {
 		pctx->package = *package;
 		pctx->merge = true;
 	}
@@ -537,7 +634,7 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	 * NB: the config file can still override the package name
 	 */
 	if (name) {
-		UCI_ASSERT(ctx, uci_validate_name(name));
+		UCI_ASSERT(ctx, uci_validate_package(name));
 		pctx->name = name;
 	}
 
@@ -551,12 +648,14 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 error:
 		if (ctx->flags & UCI_FLAG_PERROR)
 			uci_perror(ctx, NULL);
-		if ((ctx->errno != UCI_ERR_PARSE) ||
+		if ((ctx->err != UCI_ERR_PARSE) ||
 			(ctx->flags & UCI_FLAG_STRICT))
-			UCI_THROW(ctx, ctx->errno);
+			UCI_THROW(ctx, ctx->err);
 	}
 
 	uci_fixup_section(ctx, ctx->pctx->section);
+	if (!pctx->package && name)
+		uci_switch_config(ctx);
 	if (package)
 		*package = pctx->package;
 	if (pctx->merge)
@@ -566,7 +665,7 @@ error:
 	uci_switch_config(ctx);
 
 	/* no error happened, we can get rid of the parser context now */
-	uci_file_cleanup(ctx);
+	uci_cleanup(ctx);
 
 	return 0;
 }
@@ -576,69 +675,23 @@ static char *uci_config_path(struct uci_context *ctx, const char *name)
 {
 	char *filename;
 
-	UCI_ASSERT(ctx, uci_validate_name(name));
+	UCI_ASSERT(ctx, uci_validate_package(name));
 	filename = uci_malloc(ctx, strlen(name) + strlen(ctx->confdir) + 2);
 	sprintf(filename, "%s/%s", ctx->confdir, name);
 
 	return filename;
 }
 
-int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
+static void uci_file_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite)
 {
-	char *filename;
-	bool confdir;
-	FILE *file = NULL;
-
-	UCI_HANDLE_ERR(ctx);
-
-	switch (name[0]) {
-	case '.':
-		/* relative path outside of /etc/config */
-		if (name[1] != '/')
-			UCI_THROW(ctx, UCI_ERR_NOTFOUND);
-		/* fall through */
-	case '/':
-		/* absolute path outside of /etc/config */
-		filename = uci_strdup(ctx, name);
-		name = strrchr(name, '/') + 1;
-		confdir = false;
-		break;
-	default:
-		/* config in /etc/config */
-		filename = uci_config_path(ctx, name);
-		confdir = true;
-		break;
-	}
-
-	file = uci_open_stream(ctx, filename, SEEK_SET, false, false);
-	ctx->errno = 0;
-	UCI_TRAP_SAVE(ctx, done);
-	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, false);
-	}
-
-done:
-	uci_close_stream(file);
-	return ctx->errno;
-}
-
-int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overwrite)
-{
-	struct uci_package *p;
-	FILE *f = NULL;
+	struct uci_package *p = *package;
+	FILE *f1, *f2 = NULL;
 	char *name = NULL;
 	char *path = NULL;
+	char *filename = NULL;
+	struct stat statbuf;
+	bool do_rename = false;
 
-	UCI_HANDLE_ERR(ctx);
-	UCI_ASSERT(ctx, package != NULL);
-	p = *package;
-
-	UCI_ASSERT(ctx, p != NULL);
 	if (!p->path) {
 		if (overwrite)
 			p->path = uci_config_path(ctx, p->e.name);
@@ -646,65 +699,81 @@ int uci_commit(struct uci_context *ctx, struct uci_package **package, bool overw
 			UCI_THROW(ctx, UCI_ERR_INVAL);
 	}
 
+	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 */
-	f = uci_open_stream(ctx, p->path, SEEK_SET, true, true);
+	f1 = uci_open_stream(ctx, p->path, SEEK_SET, true, true);
 
-	/* flush unsaved changes and reload from history file */
+	/* flush unsaved changes and reload from delta file */
 	UCI_TRAP_SAVE(ctx, done);
-	if (p->confdir) {
+	if (p->has_delta) {
 		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))
+			/* dump our own changes to the delta file */
+			if (!uci_list_empty(&p->delta))
 				UCI_INTERNAL(uci_save, ctx, p);
 
-			/* 
-			 * other processes might have modified the config 
-			 * as well. dump and reload 
+			/*
+			 * 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);
+			uci_cleanup(ctx);
+			UCI_INTERNAL(uci_import, ctx, f1, name, &p, true);
 
 			p->path = path;
-			p->confdir = true;
+			p->has_delta = true;
 			*package = p;
 
 			/* freed together with the uci_package */
 			path = NULL;
-
-			/* check for updated history, flush */
-			if (!uci_load_history(ctx, p, true))
-				goto done;
-		} else {
-			/* flush history */
-			if (!uci_load_history(ctx, NULL, true))
-				goto done;
 		}
+
+		/* flush delta */
+		if (!uci_load_delta(ctx, p, true))
+			goto done;
 	}
 
-	rewind(f);
-	ftruncate(fileno(f), 0);
+	f2 = uci_open_stream(ctx, filename, SEEK_SET, true, true);
+	uci_export(ctx, f2, p, false);
+
+	fflush(f2);
+	fsync(fileno(f2));
+	uci_close_stream(f2);
+
+	do_rename = true;
 
-	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);
-
-	return 0;
+	free(name);
+	free(path);
+	uci_close_stream(f1);
+	if (do_rename && rename(filename, p->path)) {
+		unlink(filename);
+		UCI_THROW(ctx, UCI_ERR_IO);
+	}
+	free(filename);
+	sync();
+	if (ctx->err)
+		UCI_THROW(ctx, ctx->err);
 }
 
 
-/* 
+/*
  * This function returns the filename by returning the string
  * after the last '/' character. By checking for a non-'\0'
  * character afterwards, directories are ignored (glob marks
@@ -721,7 +790,7 @@ static inline char *get_filename(char *path)
 	return p;
 }
 
-int uci_list_configs(struct uci_context *ctx, char ***list)
+static char **uci_list_config_files(struct uci_context *ctx)
 {
 	char **configs;
 	glob_t globbuf;
@@ -729,12 +798,12 @@ int uci_list_configs(struct uci_context *ctx, char ***list)
 	char *buf;
 	char *dir;
 
-	UCI_HANDLE_ERR(ctx);
-
 	dir = uci_malloc(ctx, strlen(ctx->confdir) + 1 + sizeof("/*"));
 	sprintf(dir, "%s/*", ctx->confdir);
-	if (glob(dir, GLOB_MARK, NULL, &globbuf) != 0)
+	if (glob(dir, GLOB_MARK, NULL, &globbuf) != 0) {
+		free(dir);
 		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+	}
 
 	size = sizeof(char *) * (globbuf.gl_pathc + 1);
 	for(i = 0; i < globbuf.gl_pathc; i++) {
@@ -756,13 +825,67 @@ int uci_list_configs(struct uci_context *ctx, char ***list)
 		if (!p)
 			continue;
 
+		if (!uci_validate_package(p))
+			continue;
+
 		configs[i] = buf;
 		strcpy(buf, p);
 		buf += strlen(buf) + 1;
 	}
-	*list = configs;
 	free(dir);
+	globfree(&globbuf);
+	return configs;
+}
 
-	return 0;
+static struct uci_package *uci_file_load(struct uci_context *ctx, const char *name)
+{
+	struct uci_package *package = NULL;
+	char *filename;
+	bool confdir;
+	FILE *file = NULL;
+
+	switch (name[0]) {
+	case '.':
+		/* relative path outside of /etc/config */
+		if (name[1] != '/')
+			UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+		/* fall through */
+	case '/':
+		/* absolute path outside of /etc/config */
+		filename = uci_strdup(ctx, name);
+		name = strrchr(name, '/') + 1;
+		confdir = false;
+		break;
+	default:
+		/* config in /etc/config */
+		filename = uci_config_path(ctx, name);
+		confdir = true;
+		break;
+	}
+
+	UCI_TRAP_SAVE(ctx, done);
+	file = uci_open_stream(ctx, filename, SEEK_SET, false, false);
+	ctx->err = 0;
+	UCI_INTERNAL(uci_import, ctx, file, name, &package, true);
+	UCI_TRAP_RESTORE(ctx);
+
+	if (package) {
+		package->path = filename;
+		package->has_delta = confdir;
+		uci_load_delta(ctx, package, false);
+	}
+
+done:
+	uci_close_stream(file);
+	if (ctx->err) {
+		free(filename);
+		UCI_THROW(ctx, ctx->err);
+	}
+	return package;
 }
 
+__private UCI_BACKEND(uci_file_backend, "file",
+	.load = uci_file_load,
+	.commit = uci_file_commit,
+	.list_configs = uci_list_config_files,
+);