X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=delta.c;h=b56df5bbc01c5433dd1b6555584f5123f040d9a1;hp=111321cdb7d97f26c840a4b1c36d55f53589bd59;hb=32815cf4959c3219b8b6051efcf045c0d829dc10;hpb=e81961bde820a84bf67ccd5e40b29f7952dd1f77

diff --git a/delta.c b/delta.c
index 111321c..b56df5b 100644
--- a/delta.c
+++ b/delta.c
@@ -87,6 +87,8 @@ int uci_add_delta_path(struct uci_context *ctx, const char *dir)
 
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, dir != NULL);
+	if (!strcmp(dir, ctx->savedir))
+		return -1;
 	e = uci_alloc_generic(ctx, UCI_TYPE_PATH, dir, sizeof(struct uci_element));
 	uci_list_add(&ctx->delta_path, &e->list);
 
@@ -114,7 +116,7 @@ static inline int uci_parse_delta_tuple(struct uci_context *ctx, char **buf, str
 	case '|':
 		c = UCI_CMD_LIST_ADD;
 		break;
-	case '_':
+	case '~':
 		c = UCI_CMD_LIST_DEL;
 		break;
 	}
@@ -240,7 +242,7 @@ static int uci_load_delta_file(struct uci_context *ctx, struct uci_package *p, c
 	int changes = 0;
 
 	UCI_TRAP_SAVE(ctx, done);
-	stream = uci_open_stream(ctx, filename, SEEK_SET, flush, false);
+	stream = uci_open_stream(ctx, filename, NULL, SEEK_SET, flush, false);
 	if (p)
 		changes = uci_parse_delta(ctx, stream, p);
 	UCI_TRAP_RESTORE(ctx);
@@ -282,8 +284,7 @@ __private int uci_load_delta(struct uci_context *ctx, struct uci_package *p, boo
 			UCI_THROW(ctx, UCI_ERR_IO);
 		}
 	}
-	if (filename)
-		free(filename);
+	free(filename);
 	uci_close_stream(f);
 	ctx->err = 0;
 	return changes;
@@ -306,7 +307,7 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
 		UCI_THROW(ctx, UCI_ERR_MEM);
 
 	UCI_TRAP_SAVE(ctx, done);
-	f = uci_open_stream(ctx, filename, SEEK_SET, true, false);
+	f = uci_open_stream(ctx, filename, NULL, SEEK_SET, true, false);
 	pctx->file = f;
 	while (!feof(f)) {
 		struct uci_element *e;
@@ -317,8 +318,8 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
 		if (!buf[0])
 			continue;
 
-		/* NB: need to allocate the element before the call to 
-		 * uci_parse_delta_tuple, otherwise the original string 
+		/* NB: need to allocate the element before the call to
+		 * uci_parse_delta_tuple, otherwise the original string
 		 * gets modified before it is saved */
 		e = uci_alloc_generic(ctx, UCI_TYPE_DELTA, pctx->buf, sizeof(struct uci_element));
 		uci_list_add(&list, &e->list);
@@ -347,8 +348,7 @@ static void uci_filter_delta(struct uci_context *ctx, const char *name, const ch
 	UCI_TRAP_RESTORE(ctx);
 
 done:
-	if (filename)
-		free(filename);
+	free(filename);
 	uci_close_stream(pctx->file);
 	uci_foreach_element_safe(&list, tmp, e) {
 		uci_free_element(e);
@@ -366,7 +366,7 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
 	uci_expand_ptr(ctx, ptr, false);
 	UCI_ASSERT(ctx, ptr->p->has_delta);
 
-	/* 
+	/*
 	 * - flush unwritten changes
 	 * - save the package name
 	 * - unload the package
@@ -376,7 +376,7 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
 	UCI_TRAP_SAVE(ctx, error);
 	UCI_INTERNAL(uci_save, ctx, ptr->p);
 
-	/* NB: need to clone package, section and option names, 
+	/* NB: need to clone package, section and option names,
 	 * as they may get freed on uci_free_package() */
 	package = uci_strdup(ctx, ptr->p->e.name);
 	if (ptr->section)
@@ -392,12 +392,9 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
 	ctx->err = 0;
 
 error:
-	if (package)
-		free(package);
-	if (section)
-		free(section);
-	if (option)
-		free(option);
+	free(package);
+	free(section);
+	free(option);
 	if (ctx->err)
 		UCI_THROW(ctx, ctx->err);
 	return 0;
@@ -413,7 +410,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 	UCI_HANDLE_ERR(ctx);
 	UCI_ASSERT(ctx, p != NULL);
 
-	/* 
+	/*
 	 * if the config file was outside of the /etc/config path,
 	 * don't save the delta to a file, update the real file
 	 * directly.
@@ -425,28 +422,22 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 	if (uci_list_empty(&p->delta))
 		return 0;
 
-	if (stat(ctx->savedir, &statbuf) < 0)
-		mkdir(ctx->savedir, UCI_DIRMODE);
-	else if ((statbuf.st_mode & S_IFMT) != S_IFDIR)
+	if (stat(ctx->savedir, &statbuf) < 0) {
+		if (stat(ctx->confdir, &statbuf) == 0) {
+			mkdir(ctx->savedir, statbuf.st_mode);
+		} else {
+			mkdir(ctx->savedir, UCI_DIRMODE);
+		}
+	} else if ((statbuf.st_mode & S_IFMT) != S_IFDIR) {
 		UCI_THROW(ctx, UCI_ERR_IO);
+	}
 
 	if ((asprintf(&filename, "%s/%s", ctx->savedir, p->e.name) < 0) || !filename)
 		UCI_THROW(ctx, UCI_ERR_MEM);
 
-	uci_foreach_element(&ctx->hooks, tmp) {
-		struct uci_hook *hook = uci_to_hook(tmp);
-
-		if (!hook->ops->set)
-			continue;
-
-		uci_foreach_element(&p->delta, e) {
-			hook->ops->set(hook->ops, p, uci_to_delta(e));
-		}
-	}
-
 	ctx->err = 0;
 	UCI_TRAP_SAVE(ctx, done);
-	f = uci_open_stream(ctx, filename, SEEK_END, true, true);
+	f = uci_open_stream(ctx, filename, NULL, SEEK_END, true, true);
 	UCI_TRAP_RESTORE(ctx);
 
 	uci_foreach_element_safe(&p->delta, tmp, e) {
@@ -470,7 +461,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 			prefix = "|";
 			break;
 		case UCI_CMD_LIST_DEL:
-			prefix = "_";
+			prefix = "~";
 			break;
 		default:
 			break;
@@ -482,15 +473,25 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 
 		if (h->cmd == UCI_CMD_REMOVE && !h->value)
 			fprintf(f, "\n");
-		else
-			fprintf(f, "=%s\n", h->value);
+		else {
+			int i;
+
+			fprintf(f, "='");
+			for (i = 0; h->value[i]; i++) {
+				unsigned char c = h->value[i];
+				if (c != '\'')
+					fputc(c, f);
+				else
+					fprintf(f, "'\\''");
+			}
+			fprintf(f, "'\n");
+		}
 		uci_free_delta(h);
 	}
 
 done:
 	uci_close_stream(f);
-	if (filename)
-		free(filename);
+	free(filename);
 	if (ctx->err)
 		UCI_THROW(ctx, ctx->err);