projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add import merging functionality, fix error handling in uci_import
[project/uci.git]
/
file.c
diff --git
a/file.c
b/file.c
index
c6ea7b4
..
afa57bf
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-372,6
+372,7
@@
static void uci_fixup_section(struct uci_context *ctx, struct uci_section *s)
*/
static void uci_parse_config(struct uci_context *ctx, char **str)
{
*/
static void uci_parse_config(struct uci_context *ctx, char **str)
{
+ struct uci_parse_context *pctx = ctx->pctx;
struct uci_section *s;
char *name = NULL;
char *type = NULL;
struct uci_section *s;
char *name = NULL;
char *type = NULL;
@@
-390,7
+391,11
@@
static void uci_parse_config(struct uci_context *ctx, char **str)
type = next_arg(ctx, str, true, true);
name = next_arg(ctx, str, false, true);
assert_eol(ctx, str);
type = next_arg(ctx, str, true, true);
name = next_arg(ctx, str, false, true);
assert_eol(ctx, str);
- ctx->pctx->section = uci_alloc_section(ctx->pctx->package, type, name);
+
+ if (pctx->merge)
+ UCI_INTERNAL(uci_set, ctx, pctx->package, name, NULL, type);
+ else
+ pctx->section = uci_alloc_section(pctx->package, type, name);
}
/*
}
/*
@@
-398,10
+403,11
@@
static void uci_parse_config(struct uci_context *ctx, char **str)
*/
static void uci_parse_option(struct uci_context *ctx, char **str)
{
*/
static void uci_parse_option(struct uci_context *ctx, char **str)
{
+ struct uci_parse_context *pctx = ctx->pctx;
char *name = NULL;
char *value = NULL;
char *name = NULL;
char *value = NULL;
- if (!
ctx->
pctx->section)
+ if (!pctx->section)
uci_parse_error(ctx, *str, "option command found before the first section");
/* command string null-terminated by strtok */
uci_parse_error(ctx, *str, "option command found before the first section");
/* command string null-terminated by strtok */
@@
-410,7
+416,11
@@
static void uci_parse_option(struct uci_context *ctx, char **str)
name = next_arg(ctx, str, true, true);
value = next_arg(ctx, str, true, false);
assert_eol(ctx, str);
name = next_arg(ctx, str, true, true);
value = next_arg(ctx, str, true, false);
assert_eol(ctx, str);
- uci_alloc_option(ctx->pctx->section, name, value);
+
+ if (pctx->merge)
+ UCI_INTERNAL(uci_set, ctx, pctx->package, pctx->section->e.name, name, value);
+ else
+ uci_alloc_option(pctx->section, name, value);
}
}
@@
-537,6
+547,7
@@
int uci_export(struct uci_context *ctx, FILE *stream, struct uci_package *packag
int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single)
{
struct uci_parse_context *pctx;
int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct uci_package **package, bool single)
{
struct uci_parse_context *pctx;
+ UCI_HANDLE_ERR(ctx);
/* make sure no memory from previous parse attempts is leaked */
uci_file_cleanup(ctx);
/* make sure no memory from previous parse attempts is leaked */
uci_file_cleanup(ctx);
@@
-544,6
+555,10
@@
int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
ctx->pctx = pctx;
pctx->file = stream;
pctx = (struct uci_parse_context *) uci_malloc(ctx, sizeof(struct uci_parse_context));
ctx->pctx = pctx;
pctx->file = stream;
+ if (*package && single) {
+ pctx->package = *package;
+ pctx->merge = true;
+ }
/*
* If 'name' was supplied, assume that the supplied stream does not contain
/*
* If 'name' was supplied, assume that the supplied stream does not contain
@@
-639,6
+654,7
@@
static void uci_close_stream(FILE *stream)
static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *p, char *buf)
{
bool delete = false;
static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *p, char *buf)
{
bool delete = false;
+ bool rename = false;
char *package = NULL;
char *section = NULL;
char *option = NULL;
char *package = NULL;
char *section = NULL;
char *option = NULL;
@@
-647,6
+663,9
@@
static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
if (buf[0] == '-') {
delete = true;
buf++;
if (buf[0] == '-') {
delete = true;
buf++;
+ } else if (buf[0] == '@') {
+ rename = true;
+ buf++;
}
UCI_INTERNAL(uci_parse_tuple, ctx, buf, &package, §ion, &option, &value);
}
UCI_INTERNAL(uci_parse_tuple, ctx, buf, &package, §ion, &option, &value);
@@
-659,8
+678,10
@@
static void uci_parse_history_line(struct uci_context *ctx, struct uci_package *
if (option && !uci_validate_name(option))
goto error;
if (option && !uci_validate_name(option))
goto error;
- if (delete)
- UCI_INTERNAL(uci_del, ctx, p, section, option);
+ if (rename)
+ UCI_INTERNAL(uci_rename, ctx, p, section, option, value);
+ else if (delete)
+ UCI_INTERNAL(uci_delete, ctx, p, section, option);
else
UCI_INTERNAL(uci_set, ctx, p, section, option, value);
else
UCI_INTERNAL(uci_set, ctx, p, section, option, value);
@@
-809,6
+830,8
@@
int uci_save(struct uci_context *ctx, struct uci_package *p)
if (h->cmd == UCI_CMD_REMOVE)
fprintf(f, "-");
if (h->cmd == UCI_CMD_REMOVE)
fprintf(f, "-");
+ else if (h->cmd == UCI_CMD_RENAME)
+ fprintf(f, "@");
fprintf(f, "%s.%s", p->e.name, h->section);
if (e->name)
fprintf(f, "%s.%s", p->e.name, h->section);
if (e->name)