diff options
| author | Mike Frysinger | 2009-06-01 14:09:09 -0400 |
|---|---|---|
| committer | Mike Frysinger | 2009-06-01 16:01:28 -0400 |
| commit | b6bca7703bbe6aacec0bda964c82fad389a02b69 (patch) | |
| tree | 59696310ddbfbc919c99aca7704243d5a55773d8 | |
| parent | 77508d70bfa9c50477479af176ff41e9443d4f67 (diff) | |
| download | busybox-b6bca7703bbe6aacec0bda964c82fad389a02b69.zip busybox-b6bca7703bbe6aacec0bda964c82fad389a02b69.tar.gz | |
hush: add support for special vars in braces
Some people like to use ${?} rather than $?, so make sure we support all
the special single char vars that use this form.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
| -rw-r--r-- | shell/hush.c | 3 | ||||
| -rw-r--r-- | shell/hush_test/hush-vars/param_expand_indicate_error.right | 1 | ||||
| -rwxr-xr-x | shell/hush_test/hush-vars/param_expand_indicate_error.tests | 2 | ||||
| -rw-r--r-- | shell/hush_test/hush-vars/var1.right | 4 | ||||
| -rwxr-xr-x | shell/hush_test/hush-vars/var1.tests | 4 | ||||
| -rw-r--r-- | shell/hush_test/hush-vars/var3.right | 1 | ||||
| -rwxr-xr-x | shell/hush_test/hush-vars/var3.tests | 2 |
7 files changed, 9 insertions, 8 deletions
diff --git a/shell/hush.c b/shell/hush.c index 735cb4c..d067e91 100644 --- a/shell/hush.c +++ b/shell/hush.c @@ -5272,6 +5272,9 @@ static int handle_dollar(o_string *as_string, all_digits = true; goto char_ok; } + /* They're being verbose and doing ${?} */ + if (i_peek(input) == '}' && strchr("$!?#*@_", ch)) + goto char_ok; } if (expansion < 2 diff --git a/shell/hush_test/hush-vars/param_expand_indicate_error.right b/shell/hush_test/hush-vars/param_expand_indicate_error.right index ec4908c..590bb20 100644 --- a/shell/hush_test/hush-vars/param_expand_indicate_error.right +++ b/shell/hush_test/hush-vars/param_expand_indicate_error.right @@ -1,5 +1,4 @@ hush: syntax error: unterminated ${name} -hush: syntax error: unterminated ${name} 0 0 _ diff --git a/shell/hush_test/hush-vars/param_expand_indicate_error.tests b/shell/hush_test/hush-vars/param_expand_indicate_error.tests index 1f94181..bccba3e 100755 --- a/shell/hush_test/hush-vars/param_expand_indicate_error.tests +++ b/shell/hush_test/hush-vars/param_expand_indicate_error.tests @@ -1,7 +1,7 @@ # do all of these in subshells since it's supposed to error out # first try some invalid patterns -"$THIS_SH" -c 'echo ${?}' +#"$THIS_SH" -c 'echo ${?}' -- this is valid as it's the same as $? "$THIS_SH" -c 'echo ${:?}' # then some funky ones diff --git a/shell/hush_test/hush-vars/var1.right b/shell/hush_test/hush-vars/var1.right index 14b2314..194e7db 100644 --- a/shell/hush_test/hush-vars/var1.right +++ b/shell/hush_test/hush-vars/var1.right @@ -1,4 +1,4 @@ http://busybox.net http://busybox.net_abc -1 -1 +1 1 +1 1 diff --git a/shell/hush_test/hush-vars/var1.tests b/shell/hush_test/hush-vars/var1.tests index 0a63696..48a6782 100755 --- a/shell/hush_test/hush-vars/var1.tests +++ b/shell/hush_test/hush-vars/var1.tests @@ -4,6 +4,6 @@ echo $URL echo ${URL}_abc true -false; echo $? +false; echo $? ${?} true -{ false; echo $?; } +{ false; echo $? ${?}; } diff --git a/shell/hush_test/hush-vars/var3.right b/shell/hush_test/hush-vars/var3.right index e772aaa..5e28d2f 100644 --- a/shell/hush_test/hush-vars/var3.right +++ b/shell/hush_test/hush-vars/var3.right @@ -1,3 +1,2 @@ hush: syntax error: unterminated ${name} hush: syntax error: unterminated ${name} -hush: syntax error: unterminated ${name} diff --git a/shell/hush_test/hush-vars/var3.tests b/shell/hush_test/hush-vars/var3.tests index e09f433..aea36d6 100755 --- a/shell/hush_test/hush-vars/var3.tests +++ b/shell/hush_test/hush-vars/var3.tests @@ -1,4 +1,4 @@ # reject invalid vars "$THIS_SH" -c 'echo ${1q}' "$THIS_SH" -c 'echo ${&}' -"$THIS_SH" -c 'echo ${$}' +#"$THIS_SH" -c 'echo ${$}' -- this is valid as it's the same as $$ |