/* record a change that was done to a package */
void
-uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *section, char *option, char *value)
+uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, const char *section, const char *option, const char *value)
{
struct uci_history *h;
int size = strlen(section) + 1;
{
int c = UCI_CMD_CHANGE;
- if (**buf == '-') {
+ switch(**buf) {
+ case '-':
c = UCI_CMD_REMOVE;
- *buf += 1;
- } else if (**buf == '@') {
+ break;
+ case '@':
c = UCI_CMD_RENAME;
- *buf += 1;
- } else if (**buf == '+') {
- /* UCI_CMD_ADD is used for anonymous sections */
+ break;
+ case '+':
+ /* UCI_CMD_ADD is used for anonymous sections or list values */
c = UCI_CMD_ADD;
- *buf += 1;
+ break;
+ case '|':
+ c = UCI_CMD_LIST_ADD;
+ break;
}
+
+ if (c != UCI_CMD_CHANGE)
+ *buf += 1;
+
if (cmd)
*cmd = c;
case UCI_CMD_REMOVE:
UCI_INTERNAL(uci_delete, ctx, p, section, option);
break;
+ case UCI_CMD_LIST_ADD:
+ UCI_INTERNAL(uci_add_list, ctx, p, section, option, value, NULL);
+ break;
case UCI_CMD_ADD:
case UCI_CMD_CHANGE:
UCI_INTERNAL(uci_set, ctx, p, section, option, value, &e);
return changes;
}
-static void uci_filter_history(struct uci_context *ctx, const char *name, char *section, char *option)
+static void uci_filter_history(struct uci_context *ctx, const char *name, const char *section, const char *option)
{
struct uci_parse_context *pctx;
struct uci_element *e, *tmp;
uci_cleanup(ctx);
}
-int uci_revert(struct uci_context *ctx, struct uci_package **pkg, char *section, char *option)
+int uci_revert(struct uci_context *ctx, struct uci_package **pkg, const char *section, const char *option)
{
struct uci_package *p;
char *name = NULL;
uci_foreach_element_safe(&p->history, tmp, e) {
struct uci_history *h = uci_to_history(e);
+ char *prefix = "";
switch(h->cmd) {
case UCI_CMD_REMOVE:
- fprintf(f, "-");
+ prefix = "-";
break;
case UCI_CMD_RENAME:
- fprintf(f, "@");
+ prefix = "@";
break;
case UCI_CMD_ADD:
- fprintf(f, "+");
+ prefix = "+";
+ break;
+ case UCI_CMD_LIST_ADD:
+ prefix = "|";
break;
default:
break;
}
- fprintf(f, "%s.%s", p->e.name, h->section);
+ fprintf(f, "%s%s.%s", prefix, p->e.name, h->section);
if (e->name)
fprintf(f, ".%s", e->name);