X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=delta.c;h=50efc07d3cd82b2d6ab3ae6da1ae6a78aa177753;hp=e0fa1b18966505c5c817cec1ac25b4a4502f1660;hb=2fcc6d756f23b439d24eb061ccd0a815a5626f69;hpb=c4402a9e59721172395d9403cfbe467209bcd6ad

diff --git a/delta.c b/delta.c
index e0fa1b1..50efc07 100644
--- a/delta.c
+++ b/delta.c
@@ -9,7 +9,7 @@
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * GNU Lesser General Public License for more details.
  */
 
 /*
@@ -25,6 +25,11 @@
 #include <fcntl.h>
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "uci.h"
+#include "uci_internal.h"
 
 /* record a change that was done to a package */
 void
@@ -109,6 +114,9 @@ static inline int uci_parse_delta_tuple(struct uci_context *ctx, char **buf, str
 	case '|':
 		c = UCI_CMD_LIST_ADD;
 		break;
+	case '~':
+		c = UCI_CMD_LIST_DEL;
+		break;
 	}
 
 	if (c != UCI_CMD_CHANGE)
@@ -133,6 +141,9 @@ static inline int uci_parse_delta_tuple(struct uci_context *ctx, char **buf, str
 	case UCI_CMD_LIST_ADD:
 		if (!ptr->option)
 			goto error;
+	case UCI_CMD_LIST_DEL:
+		if (!ptr->option)
+			goto error;
 	}
 
 	return c;
@@ -157,7 +168,7 @@ static void uci_parse_delta_line(struct uci_context *ctx, struct uci_package *p,
 
 	switch(cmd) {
 	case UCI_CMD_REORDER:
-		expand_ptr(ctx, &ptr, true);
+		uci_expand_ptr(ctx, &ptr, true);
 		if (!ptr.s)
 			UCI_THROW(ctx, UCI_ERR_NOTFOUND);
 		UCI_INTERNAL(uci_reorder_section, ctx, ptr.s, strtoul(ptr.value, NULL, 10));
@@ -171,6 +182,9 @@ static void uci_parse_delta_line(struct uci_context *ctx, struct uci_package *p,
 	case UCI_CMD_LIST_ADD:
 		UCI_INTERNAL(uci_add_list, ctx, &ptr);
 		break;
+	case UCI_CMD_LIST_DEL:
+		UCI_INTERNAL(uci_del_list, ctx, &ptr);
+		break;
 	case UCI_CMD_ADD:
 	case UCI_CMD_CHANGE:
 		UCI_INTERNAL(uci_set, ctx, &ptr);
@@ -349,7 +363,7 @@ int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
 	char *option = NULL;
 
 	UCI_HANDLE_ERR(ctx);
-	expand_ptr(ctx, ptr, false);
+	uci_expand_ptr(ctx, ptr, false);
 	UCI_ASSERT(ctx, ptr->p->has_delta);
 
 	/* 
@@ -411,25 +425,19 @@ 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);
@@ -455,6 +463,9 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 		case UCI_CMD_LIST_ADD:
 			prefix = "|";
 			break;
+		case UCI_CMD_LIST_DEL:
+			prefix = "~";
+			break;
 		default:
 			break;
 		}
@@ -463,7 +474,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 		if (e->name)
 			fprintf(f, ".%s", e->name);
 
-		if (h->cmd == UCI_CMD_REMOVE)
+		if (h->cmd == UCI_CMD_REMOVE && !h->value)
 			fprintf(f, "\n");
 		else
 			fprintf(f, "=%s\n", h->value);