return 0;
}
-static inline void uci_parse_history_tuple(struct uci_context *ctx, char **buf, char **package, char **section, char **option, char **value, int *cmd)
+static inline int uci_parse_history_tuple(struct uci_context *ctx, char **buf, struct uci_ptr *ptr)
{
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;
+ break;
+ case '|':
+ c = UCI_CMD_LIST_ADD;
+ break;
+ }
+
+ if (c != UCI_CMD_CHANGE)
*buf += 1;
+
+ UCI_INTERNAL(uci_parse_ptr, ctx, ptr, *buf);
+
+ if (!ptr->section)
+ goto error;
+ if (ptr->flags & UCI_LOOKUP_EXTENDED)
+ goto error;
+
+ switch(c) {
+ case UCI_CMD_RENAME:
+ if (!ptr->value || !uci_validate_name(ptr->value))
+ goto error;
+ break;
+ case UCI_CMD_LIST_ADD:
+ if (!ptr->option)
+ goto error;
}
- if (cmd)
- *cmd = c;
- UCI_INTERNAL(uci_parse_tuple, ctx, *buf, package, section, option, value);
- if (!*section[0])
- UCI_THROW(ctx, UCI_ERR_PARSE);
+ return c;
+error:
+ UCI_THROW(ctx, UCI_ERR_INVAL);
+ return 0;
}
static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *p, char *buf)
{
struct uci_element *e = NULL;
- bool delete = false;
- bool rename = false;
- char *package = NULL;
- char *section = NULL;
- char *option = NULL;
- char *value = NULL;
+ struct uci_ptr ptr;
int cmd;
- uci_parse_history_tuple(ctx, &buf, &package, §ion, &option, &value, &cmd);
- if (!package || (strcmp(package, p->e.name) != 0))
- goto error;
- if (!uci_validate_name(section))
- goto error;
- if (option && !uci_validate_name(option))
- goto error;
- if (rename && !uci_validate_str(value, (option || delete)))
+ cmd = uci_parse_history_tuple(ctx, &buf, &ptr);
+ if (strcmp(ptr.package, p->e.name) != 0)
goto error;
if (ctx->flags & UCI_FLAG_SAVED_HISTORY)
- uci_add_history(ctx, &p->saved_history, cmd, section, option, value);
+ uci_add_history(ctx, &p->saved_history, cmd, ptr.section, ptr.option, ptr.value);
switch(cmd) {
case UCI_CMD_RENAME:
- UCI_INTERNAL(uci_rename, ctx, p, section, option, value);
+ UCI_INTERNAL(uci_rename, ctx, &ptr);
break;
case UCI_CMD_REMOVE:
- UCI_INTERNAL(uci_delete, ctx, p, section, option);
+ UCI_INTERNAL(uci_delete, ctx, &ptr);
+ break;
+ case UCI_CMD_LIST_ADD:
+ UCI_INTERNAL(uci_add_list, ctx, &ptr);
break;
case UCI_CMD_ADD:
case UCI_CMD_CHANGE:
- UCI_INTERNAL(uci_set, ctx, p, section, option, value, &e);
- if (!option && e && (cmd == UCI_CMD_ADD))
+ UCI_INTERNAL(uci_set, ctx, &ptr);
+ e = ptr.last;
+ if (!ptr.option && e && (cmd == UCI_CMD_ADD))
uci_to_section(e)->anonymous = true;
break;
}
struct uci_element *e, *tmp;
struct uci_list list;
char *filename = NULL;
- char *p = NULL;
- char *s = NULL;
- char *o = NULL;
- char *v = NULL;
+ struct uci_ptr ptr;
FILE *f = NULL;
uci_list_init(&list);
e = uci_alloc_generic(ctx, UCI_TYPE_HISTORY, pctx->buf, sizeof(struct uci_element));
uci_list_add(&list, &e->list);
- uci_parse_history_tuple(ctx, &buf, &p, &s, &o, &v, NULL);
+ uci_parse_history_tuple(ctx, &buf, &ptr);
if (section) {
- if (!s || (strcmp(section, s) != 0))
+ if (!ptr.section || (strcmp(section, ptr.section) != 0))
continue;
}
if (option) {
- if (!o || (strcmp(option, o) != 0))
+ if (!ptr.option || (strcmp(option, ptr.option) != 0))
continue;
}
/* match, drop this element again */
done:
if (filename)
free(filename);
- uci_close_stream(f);
+ uci_close_stream(pctx->file);
uci_foreach_element_safe(&list, tmp, e) {
uci_free_element(e);
}
uci_cleanup(ctx);
}
-int uci_revert(struct uci_context *ctx, struct uci_package **pkg, const char *section, const char *option)
+int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
{
- struct uci_package *p;
- char *name = NULL;
+ char *package = NULL;
+ char *section = NULL;
+ char *option = NULL;
UCI_HANDLE_ERR(ctx);
- UCI_ASSERT(ctx, pkg != NULL);
- p = *pkg;
- UCI_ASSERT(ctx, p != NULL);
- UCI_ASSERT(ctx, p->has_history);
+ expand_ptr(ctx, ptr, false);
+ UCI_ASSERT(ctx, ptr->p->has_history);
/*
* - flush unwritten changes
* - reload the package
*/
UCI_TRAP_SAVE(ctx, error);
- UCI_INTERNAL(uci_save, ctx, p);
- name = uci_strdup(ctx, p->e.name);
+ UCI_INTERNAL(uci_save, ctx, ptr->p);
+
+ /* 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)
+ section = uci_strdup(ctx, ptr->section);
+ if (ptr->option)
+ option = uci_strdup(ctx, ptr->option);
- *pkg = NULL;
- uci_free_package(&p);
- uci_filter_history(ctx, name, section, option);
+ uci_free_package(&ptr->p);
+ uci_filter_history(ctx, package, section, option);
- UCI_INTERNAL(uci_load, ctx, name, &p);
+ UCI_INTERNAL(uci_load, ctx, package, &ptr->p);
UCI_TRAP_RESTORE(ctx);
ctx->err = 0;
error:
- if (name)
- free(name);
+ if (package)
+ free(package);
+ if (section)
+ free(section);
+ if (option)
+ free(option);
if (ctx->err)
UCI_THROW(ctx, ctx->err);
return 0;
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);
projects / project / uci.git / blobdiff