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

hush: fix quoted "${notexist-}" expansion to not disappear

Browse Source 
function                                             old     new   delta
expand_one_var                                      2296    2311     +15

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2019-05-15 13:39:19 +02:00
parent 8402969d48
commit 9e0adb9b09
5 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/ash_test/ash-vars/param_expand_default.right
View File

@ -5,3 +5,5 @@ _aaaa _aaaa _aaaa _aaaa _aaaa
_ _ _ _word _word _ _ _ _word _word
_ _ _ _ _word _ _ _ _ _word
_fff _fff _fff _fff _fff _fff _fff _fff _fff _fff
1:1
0:0

5
shell/ash_test/ash-vars/param_expand_default.tests
View File

@ -21,3 +21,8 @@ echo _$f _${f-} _${f:-} _${f-word} _${f:-word}
f=fff f=fff
echo _$f _${f-} _${f:-} _${f-word} _${f:-word} echo _$f _${f-} _${f:-} _${f-word} _${f:-word}
set --
set -- "${1-}"; echo 1:$#
set --
set -- ${1-}; echo 0:$#

6
shell/hush.c
View File

@ -6132,6 +6132,12 @@ static int encode_then_append_var_plusminus(o_string *output, int n,
/* string has no special chars /* string has no special chars
* && string has no $IFS chars * && string has no $IFS chars
*/ */
if (dquoted) {
/* Prints 1 (quoted expansion is a "" word, not nothing):
* set -- "${notexist-}"; echo $#
*/
output->has_quoted_part = 1;
}
return expand_vars_to_list(output, n, str); return expand_vars_to_list(output, n, str);
} }

2
shell/hush_test/hush-vars/param_expand_default.right
View File

@ -6,3 +6,5 @@ _aaaa _aaaa _aaaa _aaaa _aaaa
_ _ _ _word _word _ _ _ _word _word
_ _ _ _ _word _ _ _ _ _word
_fff _fff _fff _fff _fff _fff _fff _fff _fff _fff
1:1
0:0

5
shell/hush_test/hush-vars/param_expand_default.tests
View File

@ -22,3 +22,8 @@ echo _$f _${f-} _${f:-} _${f-word} _${f:-word}
f=fff f=fff
echo _$f _${f-} _${f:-} _${f-word} _${f:-word} echo _$f _${f-} _${f:-} _${f-word} _${f:-word}
set --
set -- "${1-}"; echo 1:$#
set --
set -- ${1-}; echo 0:$#