projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
turn ucimap-example.c into a test case
[project/uci.git]
/
history.c
diff --git
a/history.c
b/history.c
index
ae66f66
..
c698192
100644
(file)
--- a/
history.c
+++ b/
history.c
@@
-93,6
+93,9
@@
static inline int uci_parse_history_tuple(struct uci_context *ctx, char **buf, s
int c = UCI_CMD_CHANGE;
switch(**buf) {
int c = UCI_CMD_CHANGE;
switch(**buf) {
+ case '^':
+ c = UCI_CMD_REORDER;
+ break;
case '-':
c = UCI_CMD_REMOVE;
break;
case '-':
c = UCI_CMD_REMOVE;
break;
@@
-119,6
+122,10
@@
static inline int uci_parse_history_tuple(struct uci_context *ctx, char **buf, s
goto error;
switch(c) {
goto error;
switch(c) {
+ case UCI_CMD_REORDER:
+ if (!ptr->value || ptr->option)
+ goto error;
+ break;
case UCI_CMD_RENAME:
if (!ptr->value || !uci_validate_name(ptr->value))
goto error;
case UCI_CMD_RENAME:
if (!ptr->value || !uci_validate_name(ptr->value))
goto error;
@@
-149,6
+156,12
@@
static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
uci_add_history(ctx, &p->saved_history, cmd, ptr.section, ptr.option, ptr.value);
switch(cmd) {
uci_add_history(ctx, &p->saved_history, cmd, ptr.section, ptr.option, ptr.value);
switch(cmd) {
+ case UCI_CMD_REORDER:
+ expand_ptr(ctx, &ptr, true);
+ if (!ptr.s)
+ UCI_THROW(ctx, UCI_ERR_NOTFOUND);
+ UCI_INTERNAL(uci_reorder_section, ctx, ptr.s, strtoul(ptr.value, NULL, 10));
+ break;
case UCI_CMD_RENAME:
UCI_INTERNAL(uci_rename, ctx, &ptr);
break;
case UCI_CMD_RENAME:
UCI_INTERNAL(uci_rename, ctx, &ptr);
break;
@@
-160,7
+173,8
@@
static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
break;
case UCI_CMD_ADD:
case UCI_CMD_CHANGE:
break;
case UCI_CMD_ADD:
case UCI_CMD_CHANGE:
- UCI_INTERNAL(uci_set, ctx, p, ptr.section, ptr.option, ptr.value, &e);
+ UCI_INTERNAL(uci_set, ctx, &ptr);
+ e = ptr.last;
if (!ptr.option && e && (cmd == UCI_CMD_ADD))
uci_to_section(e)->anonymous = true;
break;
if (!ptr.option && e && (cmd == UCI_CMD_ADD))
uci_to_section(e)->anonymous = true;
break;
@@
-249,7
+263,10
@@
static int uci_load_history(struct uci_context *ctx, struct uci_package *p, bool
changes = uci_load_history_file(ctx, p, filename, &f, flush);
if (flush && f && (changes > 0)) {
rewind(f);
changes = uci_load_history_file(ctx, p, filename, &f, flush);
if (flush && f && (changes > 0)) {
rewind(f);
- ftruncate(fileno(f), 0);
+ if (ftruncate(fileno(f), 0) < 0) {
+ uci_close_stream(f);
+ UCI_THROW(ctx, UCI_ERR_IO);
+ }
}
if (filename)
free(filename);
}
if (filename)
free(filename);
@@
-307,7
+324,8
@@
static void uci_filter_history(struct uci_context *ctx, const char *name, const
/* rebuild the history file */
rewind(f);
/* rebuild the history file */
rewind(f);
- ftruncate(fileno(f), 0);
+ if (ftruncate(fileno(f), 0) < 0)
+ UCI_THROW(ctx, UCI_ERR_IO);
uci_foreach_element_safe(&list, tmp, e) {
fprintf(f, "%s\n", e->name);
uci_free_element(e);
uci_foreach_element_safe(&list, tmp, e) {
fprintf(f, "%s\n", e->name);
uci_free_element(e);
@@
-317,7
+335,7
@@
static void uci_filter_history(struct uci_context *ctx, const char *name, const
done:
if (filename)
free(filename);
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_foreach_element_safe(&list, tmp, e) {
uci_free_element(e);
}
@@
-331,7
+349,7
@@
int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
char *option = NULL;
UCI_HANDLE_ERR(ctx);
char *option = NULL;
UCI_HANDLE_ERR(ctx);
- expand_ptr(ctx, ptr,
tru
e);
+ expand_ptr(ctx, ptr,
fals
e);
UCI_ASSERT(ctx, ptr->p->has_history);
/*
UCI_ASSERT(ctx, ptr->p->has_history);
/*
@@
-347,8
+365,10
@@
int uci_revert(struct uci_context *ctx, struct uci_ptr *ptr)
/* 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);
/* 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);
- section = uci_strdup(ctx, ptr->section);
- option = uci_strdup(ctx, ptr->option);
+ if (ptr->section)
+ section = uci_strdup(ctx, ptr->section);
+ if (ptr->option)
+ option = uci_strdup(ctx, ptr->option);
uci_free_package(&ptr->p);
uci_filter_history(ctx, package, section, option);
uci_free_package(&ptr->p);
uci_filter_history(ctx, package, section, option);
@@
-399,6
+419,17
@@
int uci_save(struct uci_context *ctx, struct uci_package *p)
if ((asprintf(&filename, "%s/%s", ctx->savedir, p->e.name) < 0) || !filename)
UCI_THROW(ctx, UCI_ERR_MEM);
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->history, e) {
+ hook->ops->set(hook->ops, p, uci_to_history(e));
+ }
+ }
+
ctx->err = 0;
UCI_TRAP_SAVE(ctx, done);
f = uci_open_stream(ctx, filename, SEEK_END, true, true);
ctx->err = 0;
UCI_TRAP_SAVE(ctx, done);
f = uci_open_stream(ctx, filename, SEEK_END, true, true);
@@
-418,6
+449,9
@@
int uci_save(struct uci_context *ctx, struct uci_package *p)
case UCI_CMD_ADD:
prefix = "+";
break;
case UCI_CMD_ADD:
prefix = "+";
break;
+ case UCI_CMD_REORDER:
+ prefix = "^";
+ break;
case UCI_CMD_LIST_ADD:
prefix = "|";
break;
case UCI_CMD_LIST_ADD:
prefix = "|";
break;