X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=util.c;h=8542359da59fdb29234d47916540e6f4043606b6;hb=08889fee7780facfb6a1550372a6f78c3f885224;hp=ac7b8cb4c0e6f234f21e5d032c18c5d75289da04;hpb=7cefa00eadb4292d2c915a38a86e588c6e539d26;p=project%2Fuci.git

diff --git a/util.c b/util.c
index ac7b8cb..8542359 100644
--- a/util.c
+++ b/util.c
@@ -80,7 +80,7 @@ static unsigned int djbhash(unsigned int hash, char *str)
  * for names, only alphanum and _ is allowed (shell compatibility)
  * for types, we allow more characters
  */
-static bool uci_validate_str(const char *str, bool name)
+__plugin bool uci_validate_str(const char *str, bool name)
 {
 	if (!*str)
 		return false;
@@ -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, ".");
@@ -303,6 +303,7 @@ static void parse_single_quote(struct uci_context *ctx, char **str, char **targe
  */
 static void parse_str(struct uci_context *ctx, char **str, char **target)
 {
+	bool next = true;
 	do {
 		switch(**str) {
 		case '\'':
@@ -316,6 +317,9 @@ static void parse_str(struct uci_context *ctx, char **str, char **target)
 			/* fall through */
 		case 0:
 			goto done;
+		case ';':
+			next = false;
+			goto done;
 		case '\\':
 			if (!parse_backslash(ctx, str))
 				continue;
@@ -332,7 +336,7 @@ done:
 	 * character, skip to the next one, because the whitespace will
 	 * be overwritten by a null byte here
 	 */
-	if (**str)
+	if (**str && next)
 		*str += 1;
 
 	/* terminate the parsed string */
@@ -349,7 +353,12 @@ static char *next_arg(struct uci_context *ctx, char **str, bool required, bool n
 
 	val = ptr = *str;
 	skip_whitespace(ctx, str);
-	parse_str(ctx, str, &ptr);
+	if(*str[0] == ';') {
+		*str[0] = 0;
+		*str += 1;
+	} else {
+		parse_str(ctx, str, &ptr);
+	}
 	if (!*val) {
 		if (required)
 			uci_parse_error(ctx, *str, "insufficient arguments");