#include <ctype.h>
/* record a change that was done to a package */
-static void
-uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *section, char *option, char *value)
+void
+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;
uci_list_add(list, &h->e.list);
}
-static void
+void
uci_free_history(struct uci_history *h)
{
if (!h)
int changes = 0;
/* make sure no memory from previous parse attempts is leaked */
- ctx->internal = true;
uci_cleanup(ctx);
pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
}
/* no error happened, we can get rid of the parser context now */
- ctx->internal = true;
uci_cleanup(ctx);
return changes;
}
FILE *f = NULL;
int changes = 0;
- if (!p->confdir)
+ if (!p->has_history)
return 0;
uci_foreach_element(&ctx->history_path, e) {
if (filename)
free(filename);
uci_close_stream(f);
- ctx->errno = 0;
+ ctx->err = 0;
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_foreach_element_safe(&list, tmp, e) {
uci_free_element(e);
}
- ctx->internal = true;
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_ASSERT(ctx, pkg != NULL);
p = *pkg;
UCI_ASSERT(ctx, p != NULL);
- UCI_ASSERT(ctx, p->confdir);
+ UCI_ASSERT(ctx, p->has_history);
/*
* - flush unwritten changes
UCI_INTERNAL(uci_load, ctx, name, &p);
UCI_TRAP_RESTORE(ctx);
- ctx->errno = 0;
+ ctx->err = 0;
error:
if (name)
free(name);
- if (ctx->errno)
- UCI_THROW(ctx, ctx->errno);
+ if (ctx->err)
+ UCI_THROW(ctx, ctx->err);
return 0;
}
FILE *f = NULL;
char *filename = NULL;
struct uci_element *e, *tmp;
+ struct stat statbuf;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, p != NULL);
* directly.
* does not modify the uci_package pointer
*/
- if (!p->confdir)
+ if (!p->has_history)
return uci_commit(ctx, &p, false);
if (uci_list_empty(&p->history))
return 0;
+ if (stat(ctx->savedir, &statbuf) < 0)
+ 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);
- ctx->errno = 0;
+ ctx->err = 0;
UCI_TRAP_SAVE(ctx, done);
f = uci_open_stream(ctx, filename, SEEK_END, true, true);
UCI_TRAP_RESTORE(ctx);
uci_close_stream(f);
if (filename)
free(filename);
- if (ctx->errno)
- UCI_THROW(ctx, ctx->errno);
+ if (ctx->err)
+ UCI_THROW(ctx, ctx->err);
return 0;
}