projects
/
project
/
uci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3232be5
)
allow more types of characters for uci package names
author
Felix Fietkau
<nbd@openwrt.org>
Sat, 3 May 2008 17:02:56 +0000
(19:02 +0200)
committer
Felix Fietkau
<nbd@openwrt.org>
Sat, 3 May 2008 17:02:56 +0000
(19:02 +0200)
file.c
patch
|
blob
|
history
util.c
patch
|
blob
|
history
diff --git
a/file.c
b/file.c
index
13fdd3b
..
5ec0032
100644
(file)
--- a/
file.c
+++ b/
file.c
@@
-309,7
+309,7
@@
int uci_import(struct uci_context *ctx, FILE *stream, const char *name, struct u
* NB: the config file can still override the package name
*/
if (name) {
* NB: the config file can still override the package name
*/
if (name) {
- UCI_ASSERT(ctx, uci_validate_
name(nam
e));
+ UCI_ASSERT(ctx, uci_validate_
str(name, fals
e));
pctx->name = name;
}
pctx->name = name;
}
@@
-350,7
+350,7
@@
static char *uci_config_path(struct uci_context *ctx, const char *name)
{
char *filename;
{
char *filename;
- UCI_ASSERT(ctx, uci_validate_
name(nam
e));
+ UCI_ASSERT(ctx, uci_validate_
str(name, fals
e));
filename = uci_malloc(ctx, strlen(name) + strlen(ctx->confdir) + 2);
sprintf(filename, "%s/%s", ctx->confdir, name);
filename = uci_malloc(ctx, strlen(name) + strlen(ctx->confdir) + 2);
sprintf(filename, "%s/%s", ctx->confdir, name);
diff --git
a/util.c
b/util.c
index
a85ec9b
..
8542359
100644
(file)
--- a/
util.c
+++ b/
util.c
@@
-120,7
+120,7
@@
int uci_parse_tuple(struct uci_context *ctx, char *str, char **package, char **s
}
*package = strsep(&str, ".");
}
*package = strsep(&str, ".");
- if (!*package || !uci_validate_
name(*packag
e))
+ if (!*package || !uci_validate_
str(*package, fals
e))
goto error;
*section = strsep(&str, ".");
goto error;
*section = strsep(&str, ".");