X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=delta.c;h=8a1ca779a5580eeca474ec20b2f2adff3978e9d4;hp=f697141f9ff1e758051ac1df1c29336f47251ee3;hb=87be3798a9c01d70d707760a2a7d5b8aca9df365;hpb=b03329065717161f591ac0e28030568e462ed31e

diff --git a/delta.c b/delta.c
index f697141..8a1ca77 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.
  */
 
 /*
@@ -114,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)
@@ -138,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;
@@ -176,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);
@@ -273,8 +282,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;
@@ -338,8 +346,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);
@@ -383,12 +390,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;
@@ -416,25 +420,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);
@@ -460,6 +458,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;
 		}
@@ -468,7 +469,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);
@@ -477,8 +478,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
 
 done:
 	uci_close_stream(f);
-	if (filename)
-		free(filename);
+	free(filename);
 	if (ctx->err)
 		UCI_THROW(ctx, ctx->err);