X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=file.c;h=963bc419a46969beff07621206d7d41051084364;hb=HEAD;hp=a58e3924048dd0c96d2bc588d1420824b4fb94a5;hpb=c60702b55cf8efe9dcd359fc9aa8e9c7cd421ada;p=uci.git

diff --git a/file.c b/file.c
index a58e392..963bc41 100644
--- a/file.c
+++ b/file.c
@@ -25,8 +25,282 @@
 #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
+
+/*
+ * Fetch a new line from the input stream and resize buffer if necessary
+ */
+__private void uci_getln(struct uci_context *ctx, int offset)
+{
+	struct uci_parse_context *pctx = ctx->pctx;
+	char *p;
+	int ofs;
+
+	if (pctx->buf == NULL) {
+		pctx->buf = uci_malloc(ctx, LINEBUF);
+		pctx->bufsz = LINEBUF;
+	}
+
+	ofs = offset;
+	do {
+		p = &pctx->buf[ofs];
+		p[ofs] = 0;
+
+		p = fgets(p, pctx->bufsz - ofs, pctx->file);
+		if (!p || !*p)
+			return;
+
+		ofs += strlen(p);
+		if (pctx->buf[ofs - 1] == '\n') {
+			pctx->line++;
+			pctx->buf[ofs - 1] = 0;
+			return;
+		}
+
+		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);
+	} 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
+ */
+static inline bool parse_backslash(struct uci_context *ctx, char **str)
+{
+	/* skip backslash */
+	*str += 1;
+
+	/* undecoded backslash at the end of line, fetch the next line */
+	if (!**str) {
+		*str += 1;
+		uci_getln(ctx, *str - ctx->pctx->buf);
+		return false;
+	}
+
+	/* FIXME: decode escaped char, necessary? */
+	return true;
+}
+
+/*
+ * move the string pointer forward until a non-whitespace character or
+ * EOL is reached
+ */
+static void skip_whitespace(struct uci_context *ctx, char **str)
+{
+restart:
+	while (**str && isspace(**str))
+		*str += 1;
+
+	if (**str == '\\') {
+		if (!parse_backslash(ctx, str))
+			goto restart;
+	}
+}
+
+static inline void addc(char **dest, char **src)
+{
+	**dest = **src;
+	*dest += 1;
+	*src += 1;
+}
+
+/*
+ * parse a double quoted string argument from the command line
+ */
+static void parse_double_quote(struct uci_context *ctx, char **str, char **target)
+{
+	char c;
+
+	/* skip quote character */
+	*str += 1;
+
+	while ((c = **str)) {
+		switch(c) {
+		case '"':
+			**target = 0;
+			*str += 1;
+			return;
+		case '\\':
+			if (!parse_backslash(ctx, str))
+				continue;
+			/* fall through */
+		default:
+			addc(target, str);
+			break;
+		}
+	}
+	uci_parse_error(ctx, *str, "unterminated \"");
+}
+
+/*
+ * parse a single quoted string argument from the command line
+ */
+static void parse_single_quote(struct uci_context *ctx, char **str, char **target)
+{
+	char c;
+	/* skip quote character */
+	*str += 1;
+
+	while ((c = **str)) {
+		switch(c) {
+		case '\'':
+			**target = 0;
+			*str += 1;
+			return;
+		default:
+			addc(target, str);
+		}
+	}
+	uci_parse_error(ctx, *str, "unterminated '");
+}
+
+/*
+ * parse a string from the command line and detect the quoting style
+ */
+static void parse_str(struct uci_context *ctx, char **str, char **target)
+{
+	bool next = true;
+	do {
+		switch(**str) {
+		case '\'':
+			parse_single_quote(ctx, str, target);
+			break;
+		case '"':
+			parse_double_quote(ctx, str, target);
+			break;
+		case '#':
+			**str = 0;
+			/* fall through */
+		case 0:
+			goto done;
+		case ';':
+			next = false;
+			goto done;
+		case '\\':
+			if (!parse_backslash(ctx, str))
+				continue;
+			/* fall through */
+		default:
+			addc(target, str);
+			break;
+		}
+	} 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 && next)
+		*str += 1;
+
+	/* terminate the parsed string */
+	**target = 0;
+}
+
+/*
+ * extract the next argument from the command line
+ */
+static char *next_arg(struct uci_context *ctx, char **str, bool required, bool name)
+{
+	char *val;
+	char *ptr;
+
+	val = ptr = *str;
+	skip_whitespace(ctx, str);
+	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");
+		goto done;
+	}
+
+	if (name && !uci_validate_name(val))
+		uci_parse_error(ctx, val, "invalid character in field");
+
+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;
+}
+
 
-static struct uci_backend uci_file_backend;
 
 /*
  * verify that the end of the line or command is reached.
@@ -42,7 +316,7 @@ static void assert_eol(struct uci_context *ctx, char **str)
 		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
  */
@@ -67,7 +341,7 @@ 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
 	 */
@@ -128,7 +402,7 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 		ctx->internal = !pctx->merge;
 		UCI_NESTED(uci_add_section, ctx, pctx->package, type, &pctx->section);
 	} else {
-		UCI_NESTED(uci_fill_ptr, ctx, &ptr, &pctx->package->e, false);
+		uci_fill_ptr(ctx, &ptr, &pctx->package->e);
 		e = uci_lookup_list(&pctx->package->sections, name);
 		if (e)
 			ptr.s = uci_to_section(e);
@@ -162,7 +436,7 @@ static void uci_parse_option(struct uci_context *ctx, char **str, bool list)
 	value = next_arg(ctx, str, false, false);
 	assert_eol(ctx, str);
 
-	UCI_NESTED(uci_fill_ptr, ctx, &ptr, &pctx->section->e, false);
+	uci_fill_ptr(ctx, &ptr, &pctx->section->e);
 	e = uci_lookup_list(&pctx->section->options, name);
 	if (e)
 		ptr.o = uci_to_option(e);
@@ -336,51 +610,53 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	struct uci_parse_context *pctx;
 	UCI_HANDLE_ERR(ctx);
 
+	pctx = NULL;
 	/* make sure no memory from previous parse attempts is leaked */
 	uci_cleanup(ctx);
 
 	uci_alloc_parse_context(ctx);
 	pctx = ctx->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
-	 * the appropriate 'package <name>' string to specify the config name
-	 * NB: the config file can still override the package name
-	 */
-	if (name) {
-		UCI_ASSERT(ctx, uci_validate_package(name));
-		pctx->name = name;
-	}
+	if (pctx != NULL) {
+		pctx->file = stream;
+		if (*package && single) {
+			pctx->package = *package;
+			pctx->merge = true;
+		}
+		/*
+		 * If 'name' was supplied, assume that the supplied stream does not contain
+		 * the appropriate 'package <name>' string to specify the config name
+		 * NB: the config file can still override the package name
+		 */
+		if (name) {
+			UCI_ASSERT(ctx, uci_validate_package(name));
+			pctx->name = name;
+		}
 
-	while (!feof(pctx->file)) {
-		uci_getln(ctx, 0);
-		UCI_TRAP_SAVE(ctx, error);
-		if (pctx->buf[0])
-			uci_parse_line(ctx, single);
-		UCI_TRAP_RESTORE(ctx);
-		continue;
+		while (!feof(pctx->file)) {
+			uci_getln(ctx, 0);
+			UCI_TRAP_SAVE(ctx, error);
+			if (pctx->buf[0])
+				uci_parse_line(ctx, single);
+			UCI_TRAP_RESTORE(ctx);
+			continue;
 error:
-		if (ctx->flags & UCI_FLAG_PERROR)
-			uci_perror(ctx, NULL);
-		if ((ctx->err != UCI_ERR_PARSE) ||
-			(ctx->flags & UCI_FLAG_STRICT))
-			UCI_THROW(ctx, ctx->err);
-	}
+			if (ctx->flags & UCI_FLAG_PERROR)
+				uci_perror(ctx, NULL);
+			if ((ctx->err != UCI_ERR_PARSE) ||
+				(ctx->flags & UCI_FLAG_STRICT))
+				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)
-		pctx->package = NULL;
+		uci_fixup_section(ctx, ctx->pctx->section);
+		if (!pctx->package && name)
+			uci_switch_config(ctx);
+		if (package)
+			*package = pctx->package;
+		if (pctx->merge)
+			pctx->package = NULL;
 
-	pctx->name = NULL;
+		pctx->name = NULL;
+	}
 	uci_switch_config(ctx);
 
 	/* no error happened, we can get rid of the parser context now */
@@ -418,39 +694,35 @@ void uci_file_commit(struct uci_context *ctx, struct uci_package **package, bool
 	/* 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 */
+	/* flush unsaved changes and reload from delta file */
 	UCI_TRAP_SAVE(ctx, done);
-	if (p->has_history) {
+	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_cleanup(ctx);
 			UCI_INTERNAL(uci_import, ctx, f, name, &p, true);
 
 			p->path = path;
-			p->has_history = 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);
@@ -471,7 +743,7 @@ done:
 }
 
 
-/* 
+/*
  * 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
@@ -498,8 +770,10 @@ static char **uci_list_config_files(struct uci_context *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++) {
@@ -536,7 +810,7 @@ static char **uci_list_config_files(struct uci_context *ctx)
 static struct uci_package *uci_file_load(struct uci_context *ctx, const char *name)
 {
 	struct uci_package *package = NULL;
-	char *filename;
+	char *filename = NULL;
 	bool confdir;
 	FILE *file = NULL;
 
@@ -567,18 +841,20 @@ static struct uci_package *uci_file_load(struct uci_context *ctx, const char *na
 
 	if (package) {
 		package->path = filename;
-		package->has_history = confdir;
-		uci_load_history(ctx, package, false);
+		package->has_delta = confdir;
+		uci_load_delta(ctx, package, false);
 	}
 
 done:
 	uci_close_stream(file);
-	if (ctx->err)
+	if (ctx->err) {
+		free(filename);
 		UCI_THROW(ctx, ctx->err);
+	}
 	return package;
 }
 
-static UCI_BACKEND(uci_file_backend, "file",
+__private UCI_BACKEND(uci_file_backend, "file",
 	.load = uci_file_load,
 	.commit = uci_file_commit,
 	.list_configs = uci_list_config_files,