summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2008-05-03 19:02:56 +0200
committerFelix Fietkau <nbd@openwrt.org>2008-05-03 19:02:56 +0200
commit6c020def580232b9188232f044184c575a716cda (patch)
treee1bc11637a28b031bcb448e236da33d09e543839
parent3232be5d642dd8dc4e718a3c534a8e413ce0f49b (diff)
downloaduci-0.3.4.tar.gz
allow more types of characters for uci package namesv0.3.4
-rw-r--r--file.c4
-rw-r--r--util.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/file.c b/file.c
index 13fdd3b..5ec0032 100644
--- 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) {
- UCI_ASSERT(ctx, uci_validate_name(name));
+ UCI_ASSERT(ctx, uci_validate_str(name, false));
pctx->name = name;
}
@@ -350,7 +350,7 @@ static char *uci_config_path(struct uci_context *ctx, const char *name)
{
char *filename;
- UCI_ASSERT(ctx, uci_validate_name(name));
+ UCI_ASSERT(ctx, uci_validate_str(name, false));
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
--- 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, ".");
- if (!*package || !uci_validate_name(*package))
+ if (!*package || !uci_validate_str(*package, false))
goto error;
*section = strsep(&str, ".");