Browse Source

allow more types of characters for uci package names

Felix Fietkau 16 years ago
parent
commit
6c020def58
2 changed files with 3 additions and 3 deletions
  1. 2 2
      file.c
  2. 1 1
      util.c

+ 2 - 2
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);
 

+ 1 - 1
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, ".");