case '|':
c = UCI_CMD_LIST_ADD;
break;
- case '_':
+ case '~':
c = UCI_CMD_LIST_DEL;
break;
}
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);
prefix = "|";
break;
case UCI_CMD_LIST_DEL:
- prefix = "_";
+ prefix = "~";
break;
default:
break;