projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
constify
[project/uci.git]
/
history.c
diff --git
a/history.c
b/history.c
index
75e3f40
..
73c1bf0
100644
(file)
--- a/
history.c
+++ b/
history.c
@@
-27,7
+27,7
@@
#include <ctype.h>
/* record a change that was done to a package */
#include <ctype.h>
/* record a change that was done to a package */
-
static
void
+void
uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *section, char *option, char *value)
{
struct uci_history *h;
uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *section, char *option, char *value)
{
struct uci_history *h;
@@
-48,7
+48,7
@@
uci_add_history(struct uci_context *ctx, struct uci_list *list, int cmd, char *s
uci_list_add(list, &h->e.list);
}
uci_list_add(list, &h->e.list);
}
-
static
void
+void
uci_free_history(struct uci_history *h)
{
if (!h)
uci_free_history(struct uci_history *h)
{
if (!h)
@@
-162,7
+162,6
@@
static int uci_parse_history(struct uci_context *ctx, FILE *stream, struct uci_p
int changes = 0;
/* make sure no memory from previous parse attempts is leaked */
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));
uci_cleanup(ctx);
pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
@@
-187,7
+186,6
@@
error:
}
/* no error happened, we can get rid of the parser context now */
}
/* no error happened, we can get rid of the parser context now */
- ctx->internal = true;
uci_cleanup(ctx);
return changes;
}
uci_cleanup(ctx);
return changes;
}
@@
-219,7
+217,7
@@
static int uci_load_history(struct uci_context *ctx, struct uci_package *p, bool
FILE *f = NULL;
int changes = 0;
FILE *f = NULL;
int changes = 0;
- if (!p->
confdir
)
+ if (!p->
has_history
)
return 0;
uci_foreach_element(&ctx->history_path, e) {
return 0;
uci_foreach_element(&ctx->history_path, e) {
@@
-241,11
+239,11
@@
static int uci_load_history(struct uci_context *ctx, struct uci_package *p, bool
if (filename)
free(filename);
uci_close_stream(f);
if (filename)
free(filename);
uci_close_stream(f);
- ctx->err
no
= 0;
+ ctx->err = 0;
return changes;
}
return changes;
}
-static void uci_filter_history(struct uci_context *ctx, const char *name, c
har *section,
char *option)
+static void uci_filter_history(struct uci_context *ctx, const char *name, c
onst char *section, const
char *option)
{
struct uci_parse_context *pctx;
struct uci_element *e, *tmp;
{
struct uci_parse_context *pctx;
struct uci_element *e, *tmp;
@@
-311,11
+309,10
@@
done:
uci_foreach_element_safe(&list, tmp, e) {
uci_free_element(e);
}
uci_foreach_element_safe(&list, tmp, e) {
uci_free_element(e);
}
- ctx->internal = true;
uci_cleanup(ctx);
}
uci_cleanup(ctx);
}
-int uci_revert(struct uci_context *ctx, struct uci_package **pkg, c
har *section,
char *option)
+int uci_revert(struct uci_context *ctx, struct uci_package **pkg, c
onst char *section, const
char *option)
{
struct uci_package *p;
char *name = NULL;
{
struct uci_package *p;
char *name = NULL;
@@
-324,7
+321,7
@@
int uci_revert(struct uci_context *ctx, struct uci_package **pkg, char *section,
UCI_ASSERT(ctx, pkg != NULL);
p = *pkg;
UCI_ASSERT(ctx, p != 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
/*
* - flush unwritten changes
@@
-343,13
+340,13
@@
int uci_revert(struct uci_context *ctx, struct uci_package **pkg, char *section,
UCI_INTERNAL(uci_load, ctx, name, &p);
UCI_TRAP_RESTORE(ctx);
UCI_INTERNAL(uci_load, ctx, name, &p);
UCI_TRAP_RESTORE(ctx);
- ctx->err
no
= 0;
+ ctx->err = 0;
error:
if (name)
free(name);
error:
if (name)
free(name);
- if (ctx->err
no
)
- UCI_THROW(ctx, ctx->err
no
);
+ if (ctx->err)
+ UCI_THROW(ctx, ctx->err);
return 0;
}
return 0;
}
@@
-358,6
+355,7
@@
int uci_save(struct uci_context *ctx, struct uci_package *p)
FILE *f = NULL;
char *filename = NULL;
struct uci_element *e, *tmp;
FILE *f = NULL;
char *filename = NULL;
struct uci_element *e, *tmp;
+ struct stat statbuf;
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, p != NULL);
UCI_HANDLE_ERR(ctx);
UCI_ASSERT(ctx, p != NULL);
@@
-368,16
+366,21
@@
int uci_save(struct uci_context *ctx, struct uci_package *p)
* directly.
* does not modify the uci_package pointer
*/
* 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;
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);
if ((asprintf(&filename, "%s/%s", ctx->savedir, p->e.name) < 0) || !filename)
UCI_THROW(ctx, UCI_ERR_MEM);
- ctx->err
no
= 0;
+ ctx->err = 0;
UCI_TRAP_SAVE(ctx, done);
f = uci_open_stream(ctx, filename, SEEK_END, true, true);
UCI_TRAP_RESTORE(ctx);
UCI_TRAP_SAVE(ctx, done);
f = uci_open_stream(ctx, filename, SEEK_END, true, true);
UCI_TRAP_RESTORE(ctx);
@@
-414,8
+417,8
@@
done:
uci_close_stream(f);
if (filename)
free(filename);
uci_close_stream(f);
if (filename)
free(filename);
- if (ctx->err
no
)
- UCI_THROW(ctx, ctx->err
no
);
+ if (ctx->err)
+ UCI_THROW(ctx, ctx->err);
return 0;
}
return 0;
}