* 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.
*/
/*
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);
return 0;
}
-static inline int uci_parse_delta_tuple(struct uci_context *ctx, char **buf, struct uci_ptr *ptr)
+static inline int uci_parse_delta_tuple(struct uci_context *ctx, struct uci_ptr *ptr)
{
+ struct uci_parse_context *pctx = ctx->pctx;
+ char *str = pctx_cur_str(pctx), *arg;
int c = UCI_CMD_CHANGE;
- switch(**buf) {
+ UCI_INTERNAL(uci_parse_argument, ctx, ctx->pctx->file, &str, &arg);
+ switch(*arg) {
case '^':
c = UCI_CMD_REORDER;
break;
case '|':
c = UCI_CMD_LIST_ADD;
break;
+ case '~':
+ c = UCI_CMD_LIST_DEL;
+ break;
}
if (c != UCI_CMD_CHANGE)
- *buf += 1;
+ arg += 1;
- UCI_INTERNAL(uci_parse_ptr, ctx, ptr, *buf);
+ UCI_INTERNAL(uci_parse_ptr, ctx, ptr, arg);
if (!ptr->section)
goto error;
case UCI_CMD_LIST_ADD:
if (!ptr->option)
goto error;
+ case UCI_CMD_LIST_DEL:
+ if (!ptr->option)
+ goto error;
}
return c;
return 0;
}
-static void uci_parse_delta_line(struct uci_context *ctx, struct uci_package *p, char *buf)
+static void uci_parse_delta_line(struct uci_context *ctx, struct uci_package *p)
{
struct uci_element *e = NULL;
struct uci_ptr ptr;
int cmd;
- cmd = uci_parse_delta_tuple(ctx, &buf, &ptr);
+ cmd = uci_parse_delta_tuple(ctx, &ptr);
if (strcmp(ptr.package, p->e.name) != 0)
goto error;
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);
pctx->file = stream;
while (!feof(pctx->file)) {
+ pctx->pos = 0;
uci_getln(ctx, 0);
if (!pctx->buf[0])
continue;
* delta as possible
*/
UCI_TRAP_SAVE(ctx, error);
- uci_parse_delta_line(ctx, p, pctx->buf);
+ uci_parse_delta_line(ctx, p);
UCI_TRAP_RESTORE(ctx);
changes++;
error:
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);
UCI_THROW(ctx, UCI_ERR_IO);
}
}
- if (filename)
- free(filename);
+ free(filename);
uci_close_stream(f);
ctx->err = 0;
return changes;
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;
- char *buf;
+ pctx->pos = 0;
uci_getln(ctx, 0);
- buf = pctx->buf;
- if (!buf[0])
+ if (!pctx->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);
- uci_parse_delta_tuple(ctx, &buf, &ptr);
+ uci_parse_delta_tuple(ctx, &ptr);
if (section) {
if (!ptr.section || (strcmp(section, ptr.section) != 0))
continue;
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);
uci_expand_ptr(ctx, ptr, false);
UCI_ASSERT(ctx, ptr->p->has_delta);
- /*
+ /*
* - flush unwritten changes
* - save the package name
* - unload the package
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)
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;
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.
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) {
case UCI_CMD_LIST_ADD:
prefix = "|";
break;
+ case UCI_CMD_LIST_DEL:
+ prefix = "~";
+ break;
default:
break;
}
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);
+ 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);