projects
/
project
/
uci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
improve the argument parser
[project/uci.git]
/
list.c
diff --git
a/list.c
b/list.c
index
502f51f
..
24382c8
100644
(file)
--- a/
list.c
+++ b/
list.c
@@
-163,7
+163,7
@@
uci_add_history(struct uci_context *ctx, struct uci_package *p, int cmd, char *s
return;
if (value)
return;
if (value)
- size += strlen(
section
) + 1;
+ size += strlen(
value
) + 1;
h = uci_alloc_element(ctx, history, option, size);
ptr = uci_dataptr(h);
h = uci_alloc_element(ctx, history, option, size);
ptr = uci_dataptr(h);
@@
-339,7
+339,7
@@
int uci_set_element_value(struct uci_context *ctx, struct uci_element **element,
list = e->list.prev;
switch(e->type) {
case UCI_TYPE_SECTION:
list = e->list.prev;
switch(e->type) {
case UCI_TYPE_SECTION:
- UCI_ASSERT(ctx, uci_validate_
name(valu
e));
+ UCI_ASSERT(ctx, uci_validate_
str(value, fals
e));
size = sizeof(struct uci_section);
s = uci_to_section(e);
section = e->name;
size = sizeof(struct uci_section);
s = uci_to_section(e);
section = e->name;
@@
-433,7
+433,7
@@
int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
UCI_ASSERT(ctx, uci_validate_name(option));
UCI_ASSERT(ctx, value != NULL);
} else {
UCI_ASSERT(ctx, uci_validate_name(option));
UCI_ASSERT(ctx, value != NULL);
} else {
- UCI_ASSERT(ctx, uci_validate_
name(valu
e));
+ UCI_ASSERT(ctx, uci_validate_
str(value, fals
e));
}
/*
}
/*
@@
-446,7
+446,7
@@
int uci_set(struct uci_context *ctx, struct uci_package *p, char *section, char
goto notfound;
s = uci_to_section(e);
goto notfound;
s = uci_to_section(e);
- if (ctx->pctx)
+ if (ctx->pctx
&& ctx->pctx->merge
)
ctx->pctx->section = s;
if (option) {
ctx->pctx->section = s;
if (option) {
@@
-485,7
+485,7
@@
notfound:
uci_alloc_option(s, option, value);
else {
s = uci_alloc_section(p, value, section);
uci_alloc_option(s, option, value);
else {
s = uci_alloc_section(p, value, section);
- if (ctx->pctx)
+ if (ctx->pctx
&& ctx->pctx->merge
)
ctx->pctx->section = s;
}
ctx->pctx->section = s;
}