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

diff --git a/file.c b/file.c
index 6eaa5ec..e9a8f90 100644
--- a/file.c
+++ b/file.c
@@ -19,6 +19,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdbool.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
@@ -310,7 +311,7 @@ ignore:
 /*
  * 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;
 
@@ -319,6 +320,9 @@ static void uci_parse_package(struct uci_context *ctx, char **str)
 
 	name = next_arg(ctx, str, true);
 	assert_eol(ctx, str);
+	if (single)
+		return;
+
 	ctx->pctx->name = name;
 	uci_switch_config(ctx);
 }
@@ -375,7 +379,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;
@@ -390,7 +394,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"))
@@ -410,7 +414,7 @@ static void uci_parse_line(struct uci_context *ctx)
 }
 
 /* max number of characters that escaping adds to the string */
-#define UCI_QUOTE_ESCAPE	"'\\'"
+#define UCI_QUOTE_ESCAPE	"'\\''"
 
 /*
  * escape an uci string for export
@@ -454,7 +458,7 @@ static char *uci_escape(struct uci_context *ctx, char *str)
 /*
  * export a single config package to a file stream
  */
-static void uci_export_package(struct uci_package *p, 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;
@@ -473,7 +477,7 @@ static void uci_export_package(struct uci_package *p, FILE *stream)
 	fprintf(stream, "\n");
 }
 
-int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package)
+int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *package, bool header)
 {
 	struct uci_element *e;
 
@@ -481,18 +485,18 @@ int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *packag
 	UCI_ASSERT(ctx, stream != NULL);
 
 	if (package) {
-		uci_export_package(package, stream);
+		uci_export_package(package, stream, header);
 		goto done;
 	}
 
 	uci_foreach_element(&ctx->root, e) {
-		uci_export_package(uci_to_package(e), stream);
+		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,7 +518,7 @@ 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 (package)
@@ -567,14 +571,16 @@ int uci_load(struct uci_context *ctx, const char *name, struct uci_package **pac
 	if (fd <= 0)
 		UCI_THROW(ctx, UCI_ERR_IO);
 
-	flock(fd, LOCK_SH);
+	if (flock(fd, LOCK_SH) < 0)
+		UCI_THROW(ctx, UCI_ERR_IO);
+
 	file = fdopen(fd, "r");
 	if (!file)
 		UCI_THROW(ctx, UCI_ERR_IO);
 
 	ctx->errno = 0;
 	UCI_TRAP_SAVE(ctx, done);
-	uci_import(ctx, file, name, package);
+	uci_import(ctx, file, name, package, true);
 	UCI_TRAP_RESTORE(ctx);
 
 	if (*package) {
@@ -588,6 +594,46 @@ done:
 	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'