X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=2ca7fce4580e7cdde690396fd6877cc77b28c7ba;hp=d044c0d5908281776e8e2403f21c41d2f0e1ec23;hb=cc9710af5381d20ffa200978816a0fec999bbb62;hpb=9cfd279c11e6c5a48d9616e561e053d95e914148

diff --git a/file.c b/file.c
index d044c0d..2ca7fce 100644
--- a/file.c
+++ b/file.c
@@ -22,13 +22,13 @@
 #include <stdio.h>
 #include <ctype.h>
 
-#define LINEBUF	128
+#define LINEBUF	32
 #define LINEBUF_MAX	4096
 
 /*
  * Fetch a new line from the input stream and resize buffer if necessary
  */
-static void uci_getln(struct uci_context *ctx)
+static void uci_getln(struct uci_context *ctx, int offset)
 {
 	struct uci_parse_context *pctx = ctx->pctx;
 	char *p;
@@ -39,13 +39,13 @@ static void uci_getln(struct uci_context *ctx)
 		pctx->bufsz = LINEBUF;
 	}
 
-	ofs = 0;
+	ofs = offset;
 	do {
 		p = &pctx->buf[ofs];
 		p[ofs] = 0;
 
 		p = fgets(p, pctx->bufsz - ofs, pctx->file);
-		if (!p || !p[ofs])
+		if (!p || !*p)
 			return;
 
 		ofs += strlen(p);
@@ -67,21 +67,26 @@ static void uci_getln(struct uci_context *ctx)
 }
 
 /*
- * Clean up all extra memory used by the parser
+ * Clean up all extra memory used by the parser and exporter
  */
-static void uci_parse_cleanup(struct uci_context *ctx)
+static void uci_file_cleanup(struct uci_context *ctx)
 {
 	struct uci_parse_context *pctx;
 
+	if (ctx->buf) {
+		free(ctx->buf);
+		ctx->buf = NULL;
+		ctx->bufsz = 0;
+	}
+
 	pctx = ctx->pctx;
 	if (!pctx)
 		return;
 
 	ctx->pctx = NULL;
-	if (pctx->cfg) {
-		uci_list_del(&pctx->cfg->list);
-		uci_drop_config(pctx->cfg);
-	}
+	if (pctx->package)
+		uci_free_package(pctx->package);
+
 	if (pctx->buf)
 		free(pctx->buf);
 	if (pctx->file)
@@ -90,14 +95,41 @@ static void uci_parse_cleanup(struct uci_context *ctx)
 	free(pctx);
 }
 
+/* 
+ * 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(char **str)
+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)
@@ -107,14 +139,6 @@ static inline void addc(char **dest, char **src)
 	*src += 1;
 }
 
-static inline void parse_backslash(char **str, char **target)
-{
-	/* skip backslash */
-	*str += 1;
-	/* FIXME: decode escaped characters? */
-	addc(target, str);
-}
-
 /*
  * parse a double quoted string argument from the command line
  */
@@ -127,13 +151,14 @@ static void parse_double_quote(struct uci_context *ctx, char **str, char **targe
 
 	while ((c = **str)) {
 		switch(c) {
-		case '\\':
-			parse_backslash(str, target);
-			continue;
 		case '"':
 			**target = 0;
 			*str += 1;
 			return;
+		case '\\':
+			if (!parse_backslash(ctx, str))
+				continue;
+			/* fall through */
 		default:
 			addc(target, str);
 			break;
@@ -175,9 +200,6 @@ static void parse_str(struct uci_context *ctx, char **str, char **target)
 {
 	do {
 		switch(**str) {
-		case '\\':
-			parse_backslash(str, target);
-			continue;
 		case '\'':
 			parse_single_quote(ctx, str, target);
 			break;
@@ -186,6 +208,10 @@ static void parse_str(struct uci_context *ctx, char **str, char **target)
 			break;
 		case 0:
 			goto done;
+		case '\\':
+			if (!parse_backslash(ctx, str))
+				continue;
+			/* fall through */
 		default:
 			addc(target, str);
 			break;
@@ -214,7 +240,7 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required)
 	char *ptr;
 
 	val = ptr = *str;
-	skip_whitespace(str);
+	skip_whitespace(ctx, str);
 	parse_str(ctx, str, &ptr);
 	if (required && !*val) {
 		ctx->pctx->reason = "insufficient arguments";
@@ -222,7 +248,7 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required)
 		UCI_THROW(ctx, UCI_ERR_PARSE);
 	}
 
-	return uci_strdup(ctx, val);
+	return val;
 }
 
 /*
@@ -254,10 +280,10 @@ static void uci_switch_config(struct uci_context *ctx)
 	name = pctx->name;
 
 	/* add the last config to main config file list */
-	if (pctx->cfg) {
-		uci_list_add(&ctx->root, &pctx->cfg->list);
+	if (pctx->package) {
+		uci_list_add(&ctx->root, &pctx->package->e.list);
 
-		pctx->cfg = NULL;
+		pctx->package = NULL;
 		pctx->section = NULL;
 	}
 
@@ -274,7 +300,7 @@ static void uci_switch_config(struct uci_context *ctx)
 ignore:
 	ctx->errno = 0;
 
-	pctx->cfg = uci_alloc_config(ctx, name);
+	pctx->package = uci_alloc_package(ctx, name);
 }
 
 /*
@@ -287,18 +313,10 @@ static void uci_parse_package(struct uci_context *ctx, char **str)
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
 
-	UCI_TRAP_SAVE(ctx, error);
 	name = next_arg(ctx, str, true);
 	assert_eol(ctx, str);
 	ctx->pctx->name = name;
 	uci_switch_config(ctx);
-	UCI_TRAP_RESTORE(ctx);
-	return;
-
-error:
-	if (name)
-		free(name);
-	UCI_THROW(ctx, ctx->errno);
 }
 
 /*
@@ -309,7 +327,7 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 	char *name = NULL;
 	char *type = NULL;
 
-	if (!ctx->pctx->cfg) {
+	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";
@@ -321,20 +339,10 @@ static void uci_parse_config(struct uci_context *ctx, char **str)
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
 
-	UCI_TRAP_SAVE(ctx, error);
 	type = next_arg(ctx, str, true);
 	name = next_arg(ctx, str, false);
 	assert_eol(ctx, str);
-	ctx->pctx->section = uci_add_section(ctx->pctx->cfg, type, name);
-	UCI_TRAP_RESTORE(ctx);
-	return;
-
-error:
-	if (name)
-		free(name);
-	if (type)
-		free(type);
-	UCI_THROW(ctx, ctx->errno);
+	ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name);
 }
 
 /*
@@ -353,20 +361,10 @@ static void uci_parse_option(struct uci_context *ctx, char **str)
 	/* command string null-terminated by strtok */
 	*str += strlen(*str) + 1;
 
-	UCI_TRAP_SAVE(ctx, error);
 	name = next_arg(ctx, str, true);
 	value = next_arg(ctx, str, true);
 	assert_eol(ctx, str);
-	uci_add_option(ctx->pctx->section, name, value);
-	UCI_TRAP_RESTORE(ctx);
-	return;
-
-error:
-	if (name)
-		free(name);
-	if (value)
-		free(value);
-	UCI_THROW(ctx, ctx->errno);
+	uci_alloc_option(ctx->pctx->section, name, value);
 }
 
 
@@ -407,12 +405,95 @@ static void uci_parse_line(struct uci_context *ctx)
 	}
 }
 
-int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_config **cfg)
+/* max number of characters that escaping adds to the string */
+#define UCI_QUOTE_ESCAPE	"'\\'"
+
+/*
+ * escape an uci string for export
+ */
+static char *uci_escape(struct uci_context *ctx, char *str)
+{
+	char *s, *p, *t;
+	int pos = 0;
+
+	if (!ctx->buf) {
+		ctx->bufsz = LINEBUF;
+		ctx->buf = malloc(LINEBUF);
+	}
+
+	s = str;
+	p = strchr(str, '\'');
+	if (!p)
+		return str;
+
+	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;
+		}
+		strcpy(&ctx->buf[pos], UCI_QUOTE_ESCAPE);
+		pos += sizeof(UCI_QUOTE_ESCAPE);
+		s = p + 1;
+	} while ((p = strchr(s, '\'')));
+
+	return ctx->buf;
+}
+
+
+/*
+ * export a single config package to a file stream
+ */
+static void uci_export_package(struct uci_package *p, FILE *stream)
+{
+	struct uci_context *ctx = p->ctx;
+	struct uci_element *s, *o;
+
+	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, " '%s'\n", uci_escape(ctx, sec->e.name));
+		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));
+		}
+	}
+	fprintf(stream, "\n");
+}
+
+int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package)
+{
+	struct uci_element *e;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, stream != NULL);
+
+	if (package) {
+		uci_export_package(package, stream);
+		goto done;
+	}
+
+	uci_foreach_element(&ctx->root, e) {
+		uci_export_package(uci_to_package(e), stream);
+	}
+done:
+	return 0;
+}
+
+int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package)
 {
 	struct uci_parse_context *pctx;
 
 	/* make sure no memory from previous parse attempts is leaked */
-	uci_parse_cleanup(ctx);
+	uci_file_cleanup(ctx);
 
 	pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
 	ctx->pctx = pctx;
@@ -427,24 +508,24 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 		pctx->name = name;
 
 	while (!feof(pctx->file)) {
-		uci_getln(ctx);
+		uci_getln(ctx, 0);
 		if (pctx->buf[0])
 			uci_parse_line(ctx);
 	}
 
-	if (cfg)
-		*cfg = pctx->cfg;
+	if (package)
+		*package = pctx->package;
 
 	pctx->name = NULL;
 	uci_switch_config(ctx);
 
 	/* no error happened, we can get rid of the parser context now */
-	uci_parse_cleanup(ctx);
+	uci_file_cleanup(ctx);
 
 	return 0;
 }
 
-int uci_load(struct uci_context *ctx, const char *name, struct uci_config **cfg)
+int uci_load(struct uci_context *ctx, const char *name, struct uci_package **package)
 {
 	struct stat statbuf;
 	char *filename;
@@ -483,6 +564,6 @@ ignore:
 	if (!file)
 		UCI_THROW(ctx, UCI_ERR_IO);
 
-	return uci_import(ctx, file, name, cfg);
+	return uci_import(ctx, file, name, package);
 }