emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hush: handle expansions in ${var?expanded_word} constructs

Browse Source 
function                                             old     new   delta
expand_vars_to_list                                 2209    2229     +20

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2010-05-21 17:54:46 +02:00
parent 349ef96bb5
commit 3f78cec347
3 changed files with 62 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
shell/hush_test/hush-vars/param_expand_indicate_error.right
View File

@@ -1,26 +1,41 @@
hush: syntax error: unterminated ${name}
0
0
====
_
hush: 1: parameter null or not set
hush: 1: parameter null or not set
hush: 1: message1
hush: 1: message1
hush: 1: unset!
hush: 1: null or unset!
====
_aaaa
_aaaa
_aaaa
_aaaa
_aaaa
_aaaa
_aaaa
====
_
hush: f: parameter null or not set
hush: f: parameter null or not set
hush: f: message3
hush: f: message3
hush: f: unset!
hush: f: null or unset!
====
_
_
hush: f: parameter null or not set
_
hush: f: message4
_
hush: f: null or unset!
====
_fff
_fff
_fff
_fff
_fff

20
shell/hush_test/hush-vars/param_expand_indicate_error.tests
View File

@@ -5,36 +5,56 @@
"$THIS_SH" -c 'echo ${:?}'
# then some funky ones
# note: bash prints 1 - treats it as "length of $#"? We print 0
"$THIS_SH" -c 'echo ${#?}'
# bash prints 0
"$THIS_SH" -c 'echo ${#:?}'
# now some valid ones
export msg_unset="unset!"
export msg_null_or_unset="null or unset!"
echo ====
"$THIS_SH" -c 'set --; echo _$1'
"$THIS_SH" -c 'set --; echo _${1?}'
"$THIS_SH" -c 'set --; echo _${1:?}'
"$THIS_SH" -c 'set --; echo _${1?message1}'
"$THIS_SH" -c 'set --; echo _${1:?message1}'
"$THIS_SH" -c 'set --; echo _${1?$msg_unset}'
"$THIS_SH" -c 'set --; echo _${1:?$msg_null_or_unset}'
echo ====
"$THIS_SH" -c 'set -- aaaa; echo _$1'
"$THIS_SH" -c 'set -- aaaa; echo _${1?}'
"$THIS_SH" -c 'set -- aaaa; echo _${1:?}'
"$THIS_SH" -c 'set -- aaaa; echo _${1?word}'
"$THIS_SH" -c 'set -- aaaa; echo _${1:?word}'
"$THIS_SH" -c 'set -- aaaa; echo _${1?$msg_unset}'
"$THIS_SH" -c 'set -- aaaa; echo _${1:?$msg_null_or_unset}'
echo ====
"$THIS_SH" -c 'unset f; echo _$f'
"$THIS_SH" -c 'unset f; echo _${f?}'
"$THIS_SH" -c 'unset f; echo _${f:?}'
"$THIS_SH" -c 'unset f; echo _${f?message3}'
"$THIS_SH" -c 'unset f; echo _${f:?message3}'
"$THIS_SH" -c 'unset f; echo _${f?$msg_unset}'
"$THIS_SH" -c 'unset f; echo _${f:?$msg_null_or_unset}'
echo ====
"$THIS_SH" -c 'f=; echo _$f'
"$THIS_SH" -c 'f=; echo _${f?}'
"$THIS_SH" -c 'f=; echo _${f:?}'
"$THIS_SH" -c 'f=; echo _${f?word}'
"$THIS_SH" -c 'f=; echo _${f:?message4}'
"$THIS_SH" -c 'f=; echo _${f?$msg_unset}'
"$THIS_SH" -c 'f=; echo _${f:?$msg_null_or_unset}'
echo ====
"$THIS_SH" -c 'f=fff; echo _$f'
"$THIS_SH" -c 'f=fff; echo _${f?}'
"$THIS_SH" -c 'f=fff; echo _${f:?}'
"$THIS_SH" -c 'f=fff; echo _${f?word}'
"$THIS_SH" -c 'f=fff; echo _${f:?word}'
"$THIS_SH" -c 'f=fff; echo _${f?$msg_unset}'
"$THIS_SH" -c 'f=fff; echo _${f:?$msg_null_or_unset}'