uci: fix excessive reorder delta entry duplication

[project/uci.git] / delta.c

diff --git a/delta.c b/delta.c
index 1da3b75..50efc07 100644 (file)
--- a/delta.c
+++ b/delta.c
@@ -114,7 +114,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;
        }
@@ -425,10 +425,15 @@ 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);
@@ -459,7 +464,7 @@ int uci_save(struct uci_context *ctx, struct uci_package *p)
                        prefix = "|";
                        break;
                case UCI_CMD_LIST_DEL:
-                       prefix = "_";
+                       prefix = "~";
                        break;
                default:
                        break;