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

hush: fix raw ^C handlisg in single-quoted strings

Browse Source 
function                                             old     new   delta
parse_stream                                        2719    2754     +35

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2018-01-13 19:14:27 +01:00
parent 6606c519ef
commit 9809a82b59
9 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
shell/ash_test/ash-misc/control_char1.right
View File

@ -1,2 +1,3 @@

b#c
Done:0

1
shell/ash_test/ash-misc/control_char1.tests
View File

@ -1,2 +1,3 @@
echo 
echo 'b#c'
echo Done:$?

1
shell/ash_test/ash-misc/for_with_bslashes.right
View File

@ -5,4 +5,5 @@ b"c
b'c
b$c
b`true`c
b#c
Zero:0

8
shell/ash_test/ash-misc/for_with_bslashes.tests
View File

@ -1,9 +1,5 @@
# UNFIXED BUG.
# commented-out words contain ^C character.
# It's a SPECIAL_VAR_SYMBOL, for now hush does not escape it.
# When it is fixed, update this test.
for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' ### 'b#c'
# last word contains ^C character.
for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' 'b#c'
do
echo $a
done

5
shell/hush.c
View File

@ -5225,6 +5225,11 @@ static struct pipe *parse_stream(char **pstring,
nommu_addchr(&ctx.as_string, ch);
if (ch == '\'')
break;
if (ch == SPECIAL_VAR_SYMBOL) {
/* Convert raw ^C to corresponding special variable reference */
o_addchr(&dest, SPECIAL_VAR_SYMBOL);
o_addchr(&dest, SPECIAL_VAR_QUOTED_SVS);
}
o_addqchr(&dest, ch);
}
}

1
shell/hush_test/hush-misc/control_char1.right
View File

@ -1,2 +1,3 @@

b#c
Done:0

1
shell/hush_test/hush-misc/control_char1.tests
View File

@ -1,2 +1,3 @@
echo 
echo 'b#c'
echo Done:$?

1
shell/hush_test/hush-misc/for_with_bslashes.right
View File

@ -5,4 +5,5 @@ b"c
b'c
b$c
b`true`c
b#c
Zero:0

8
shell/hush_test/hush-misc/for_with_bslashes.tests
View File

@ -1,9 +1,5 @@
# UNFIXED BUG.
# commented-out words contain ^C character.
# It's a SPECIAL_VAR_SYMBOL, for now hush does not escape it.
# When it is fixed, update this test.
for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' ### 'b#c'
# last word contains ^C character.
for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' 'b#c'
do
echo $a
done