BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hush: fix expansion of space in "a=${a:+$a }c" construct 

function                                             old     new   delta
encode_then_append_var_plusminus                     554     552      -2

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
master
Denys Vlasenko 2023-06-12 16:37:19 +02:00
parent 8f0e4c42c6
commit bab8828b0d
5 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/ash_test/ash-quoting/space_in_varexp1.right Normal file
View File

@ -0,0 +1,2 @@
1:'b c'
2:'b c'

6
shell/ash_test/ash-quoting/space_in_varexp1.tests Executable file
View File

@ -0,0 +1,6 @@
a=b
a=${a:+$a }c
echo "1:'$a'"
a=b
a="${a:+$a }c"
echo "2:'$a'"

2
shell/hush.c
View File

@ -6398,7 +6398,7 @@ static NOINLINE int encode_then_append_var_plusminus(o_string *output, int n,
if (!dest.o_expflags) {
if (ch == EOF)
break;
if (!dquoted && strchr(G.ifs, ch)) {
if (!dquoted && !(output->o_expflags & EXP_FLAG_SINGLEWORD) && strchr(G.ifs, ch)) {
/* PREFIX${x:d${e}f ...} and we met space: expand "d${e}f" and start new word.
* do not assume we are at the start of the word (PREFIX above).
*/

2
shell/hush_test/hush-quoting/space_in_varexp1.right Normal file
View File

@ -0,0 +1,2 @@
1:'b c'
2:'b c'

6
shell/hush_test/hush-quoting/space_in_varexp1.tests Executable file
View File

@ -0,0 +1,6 @@
a=b
a=${a:+$a }c
echo "1:'$a'"
a=b
a="${a:+$a }c"
echo "2:'$a'"