X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=file.c;h=e9a8f90aad158213818339a1870c2c2fb181255f;hp=84284627d26e31d70f2a04bbf189ccc2a2602406;hb=787fb6d4106cfd22485bd89d190be26e2a2c6178;hpb=d3c503179f3fdd04c12a450e1580044180dc2432

diff --git a/file.c b/file.c
index 8428462..e9a8f90 100644
--- a/file.c
+++ b/file.c
@@ -19,6 +19,8 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdbool.h>
+#include <unistd.h>
+#include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
 
@@ -45,7 +47,7 @@ static void uci_getln(struct uci_context *ctx, int offset)
 		p[ofs] = 0;
 
 		p = fgets(p, pctx->bufsz - ofs, pctx->file);
-		if (!p || !p[ofs])
+		if (!p || !*p)
 			return;
 
 		ofs += strlen(p);
@@ -67,21 +69,26 @@ static void uci_getln(struct uci_context *ctx, int offset)
 }
 
 /*
- * 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)
@@ -243,7 +250,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;
 }
 
 /*
@@ -269,16 +276,17 @@ static void assert_eol(struct uci_context *ctx, char **str)
 static void uci_switch_config(struct uci_context *ctx)
 {
 	struct uci_parse_context *pctx;
+	struct uci_element *e;
 	const char *name;
 
 	pctx = ctx->pctx;
 	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;
 	}
 
@@ -290,36 +298,33 @@ static void uci_switch_config(struct uci_context *ctx)
 	 * ignore errors here, e.g. if the config was not found
 	 */
 	UCI_TRAP_SAVE(ctx, ignore);
-	uci_unload(ctx, name);
+	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;
 
-	pctx->cfg = uci_alloc_config(ctx, name);
+	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;
 
-	UCI_TRAP_SAVE(ctx, error);
 	name = next_arg(ctx, str, true);
 	assert_eol(ctx, str);
+	if (single)
+		return;
+
 	ctx->pctx->name = name;
 	uci_switch_config(ctx);
-	UCI_TRAP_RESTORE(ctx);
-	return;
-
-error:
-	if (name)
-		free(name);
-	UCI_THROW(ctx, ctx->errno);
 }
 
 /*
@@ -330,7 +335,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";
@@ -342,20 +347,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);
 }
 
 /*
@@ -374,42 +369,32 @@ 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);
 }
 
 
 /*
  * 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;
+	char *word, *brk = NULL;
 
 	for (word = strtok_r(pctx->buf, ";", &brk);
 		 word;
 		 word = strtok_r(NULL, ";", &brk)) {
 
-		char *pbrk;
+		char *pbrk = NULL;
 		word = strtok_r(word, " \t", &pbrk);
 
 		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"))
@@ -428,12 +413,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;
+	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, bool header)
+{
+	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, bool header)
+{
+	struct uci_element *e;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, stream != NULL);
+
+	if (package) {
+		uci_export_package(package, stream, header);
+		goto done;
+	}
+
+	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, bool single)
 {
 	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;
@@ -450,45 +518,47 @@ int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
 	while (!feof(pctx->file)) {
 		uci_getln(ctx, 0);
 		if (pctx->buf[0])
-			uci_parse_line(ctx);
+			uci_parse_line(ctx, single);
 	}
 
-	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;
-	bool confpath;
+	bool confdir;
 	FILE *file;
+	int fd;
 
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, name != NULL);
 
-ignore:
-	ctx->errno = 0;
-
 	switch (name[0]) {
 	case '.':
+		if (name[1] != '/')
+			UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+		/* fall through */
 	case '/':
 		/* absolute/relative path outside of /etc/config */
-		filename = (char *) name;
-		confpath = false;
+		filename = uci_strdup(ctx, name);
+		name = strrchr(name, '/') + 1;
+		confdir = false;
 		break;
 	default:
 		filename = uci_malloc(ctx, strlen(name) + sizeof(UCI_CONFDIR) + 2);
 		sprintf(filename, UCI_CONFDIR "/%s", name);
-		confpath = true;
+		confdir = true;
 		break;
 	}
 
@@ -497,13 +567,129 @@ ignore:
 		UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 	}
 
-	file = fopen(filename, "r");
-	if (filename != name)
-		free(filename);
+	fd = open(filename, O_RDONLY);
+	if (fd <= 0)
+		UCI_THROW(ctx, UCI_ERR_IO);
+
+	if (flock(fd, LOCK_SH) < 0)
+		UCI_THROW(ctx, UCI_ERR_IO);
 
+	file = fdopen(fd, "r");
 	if (!file)
 		UCI_THROW(ctx, UCI_ERR_IO);
 
-	return uci_import(ctx, file, name, cfg);
+	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;
+	}
+
+done:
+	flock(fd, LOCK_UN);
+	fclose(file);
+	return ctx->errno;
 }
 
+int uci_commit(struct uci_context *ctx, struct uci_package *p)
+{
+	FILE *f = NULL;
+	int fd = 0;
+	int err = UCI_ERR_IO;
+
+	UCI_HANDLE_ERR(ctx);
+	UCI_ASSERT(ctx, p != NULL);
+	UCI_ASSERT(ctx, p->path != NULL);
+
+	fd = open(p->path, O_RDWR);
+	if (fd < 0)
+		goto done;
+
+	if (flock(fd, LOCK_EX) < 0)
+		goto done;
+
+	ftruncate(fd, 0);
+	f = fdopen(fd, "w");
+	if (!f)
+		goto done;
+
+	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 (ctx->errno)
+		UCI_THROW(ctx, ctx->errno);
+	if (err)
+		UCI_THROW(ctx, UCI_ERR_IO);
+	return 0;
+}
+
+
+/* 
+ * 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
+ * those with a trailing '/'
+ */
+static inline char *get_filename(char *path)
+{
+	char *p;
+
+	p = strrchr(path, '/');
+	p++;
+	if (!*p)
+		return NULL;
+	return p;
+}
+
+char **uci_list_configs(struct uci_context *ctx)
+{
+	char **configs;
+	glob_t globbuf;
+	int size, i;
+	char *buf;
+
+	if (glob(UCI_CONFDIR "/*", GLOB_MARK, NULL, &globbuf) != 0)
+		return NULL;
+
+	size = sizeof(char *) * (globbuf.gl_pathc + 1);
+	for(i = 0; i < globbuf.gl_pathc; i++) {
+		char *p;
+
+		p = get_filename(globbuf.gl_pathv[i]);
+		if (!p)
+			continue;
+
+		size += strlen(p) + 1;
+	}
+
+	configs = malloc(size);
+	if (!configs)
+		return NULL;
+
+	memset(configs, 0, size);
+	buf = (char *) &configs[globbuf.gl_pathc + 1];
+	for(i = 0; i < globbuf.gl_pathc; i++) {
+		char *p;
+
+		p = get_filename(globbuf.gl_pathv[i]);
+		if (!p)
+			continue;
+
+		configs[i] = buf;
+		strcpy(buf, p);
+		buf += strlen(buf) + 1;
+	}
+	return configs;
+}
+
+