From d4bab379481c8ef0d5710a616660f1d7144d768f Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 8 Apr 2008 21:20:41 +0200
Subject: parser: fix precedence of quoting over ; as command terminator, thx
 to netprince for spotting the bug

---
 util.c | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'util.c')

diff --git a/util.c b/util.c
index cba69c3..a85ec9b 100644
--- a/util.c
+++ b/util.c
@@ -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");
-- 
cgit v1.2.1