diff options
author | Felix Fietkau <nbd@openwrt.org> | 2008-04-08 21:20:41 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2008-04-08 21:20:41 +0200 |
commit | d4bab379481c8ef0d5710a616660f1d7144d768f (patch) | |
tree | 1d42578afea0d2e4204e7171fdd571cc55f48537 /util.c | |
parent | 043baa606728c37cedf146c38a2bab0da0ae9f18 (diff) | |
download | uci-d4bab379481c8ef0d5710a616660f1d7144d768f.tar.gz |
parser: fix precedence of quoting over ; as command terminator, thx to netprince for spotting the bugv0.3.1
Diffstat (limited to 'util.c')
-rw-r--r-- | util.c | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -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"); |