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

function                                             old     new   delta
parse_stream                                        2719    2754     +35

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

diff --git a/shell/ash_test/ash-misc/control_char1.right b/shell/ash_test/ash-misc/control_char1.right
index 9498b420d365ce095d7a45d8897666ba9537a4ae..6f8c2533cb208798cb87bbb53c19d9b86f749046 100644 (file)
--- a/shell/ash_test/ash-misc/control_char1.right
+++ b/shell/ash_test/ash-misc/control_char1.right
@@ -1,2 +1,3 @@
 \ 3
+b\ 3#\ 3c
 Done:0

diff --git a/shell/ash_test/ash-misc/control_char1.tests b/shell/ash_test/ash-misc/control_char1.tests
index a2ebeba1bd467d4da139b5d847e7bd6d2ba4e77e..0cfe601417437b3f95db7c766b6c25d66d16a722 100755 (executable)
--- a/shell/ash_test/ash-misc/control_char1.tests
+++ b/shell/ash_test/ash-misc/control_char1.tests
@@ -1,2 +1,3 @@
 echo \ 3
+echo 'b\ 3#\ 3c'
 echo Done:$?

diff --git a/shell/ash_test/ash-misc/for_with_bslashes.right b/shell/ash_test/ash-misc/for_with_bslashes.right
index 02d96692c6827c69e1d44b2271b70adffff1f77b..cd85010505de15bec5056a9f2f26ab73e12aa0ac 100644 (file)
--- a/shell/ash_test/ash-misc/for_with_bslashes.right
+++ b/shell/ash_test/ash-misc/for_with_bslashes.right
@@ -5,4 +5,5 @@ b"c
 b'c
 b$c
 b`true`c
+b\ 3#\ 3c
 Zero:0

diff --git a/shell/ash_test/ash-misc/for_with_bslashes.tests b/shell/ash_test/ash-misc/for_with_bslashes.tests
index 363f3d85b3b8e45998fd8524ff565c5b33c4ea1c..8acd9808ad89afd9e01c55f3c25cf466232b9653 100755 (executable)
--- a/shell/ash_test/ash-misc/for_with_bslashes.tests
+++ b/shell/ash_test/ash-misc/for_with_bslashes.tests
@@ -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\ 3#\ 3c'
+# last word contains ^C character.
+for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' 'b\ 3#\ 3c'
 do
     echo $a
 done

diff --git a/shell/hush.c b/shell/hush.c
index fc8940d3d1083d78fd4d6c4b04446ad3b4be65aa..79d7a53ddb26391ea27b1d7eac699d6e6c571407 100644 (file)
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -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);
                                }
                        }

diff --git a/shell/hush_test/hush-misc/control_char1.right b/shell/hush_test/hush-misc/control_char1.right
index 9498b420d365ce095d7a45d8897666ba9537a4ae..6f8c2533cb208798cb87bbb53c19d9b86f749046 100644 (file)
--- a/shell/hush_test/hush-misc/control_char1.right
+++ b/shell/hush_test/hush-misc/control_char1.right
@@ -1,2 +1,3 @@
 \ 3
+b\ 3#\ 3c
 Done:0

diff --git a/shell/hush_test/hush-misc/control_char1.tests b/shell/hush_test/hush-misc/control_char1.tests
index a2ebeba1bd467d4da139b5d847e7bd6d2ba4e77e..0cfe601417437b3f95db7c766b6c25d66d16a722 100755 (executable)
--- a/shell/hush_test/hush-misc/control_char1.tests
+++ b/shell/hush_test/hush-misc/control_char1.tests
@@ -1,2 +1,3 @@
 echo \ 3
+echo 'b\ 3#\ 3c'
 echo Done:$?

diff --git a/shell/hush_test/hush-misc/for_with_bslashes.right b/shell/hush_test/hush-misc/for_with_bslashes.right
index 02d96692c6827c69e1d44b2271b70adffff1f77b..cd85010505de15bec5056a9f2f26ab73e12aa0ac 100644 (file)
--- a/shell/hush_test/hush-misc/for_with_bslashes.right
+++ b/shell/hush_test/hush-misc/for_with_bslashes.right
@@ -5,4 +5,5 @@ b"c
 b'c
 b$c
 b`true`c
+b\ 3#\ 3c
 Zero:0

diff --git a/shell/hush_test/hush-misc/for_with_bslashes.tests b/shell/hush_test/hush-misc/for_with_bslashes.tests
index 363f3d85b3b8e45998fd8524ff565c5b33c4ea1c..8acd9808ad89afd9e01c55f3c25cf466232b9653 100755 (executable)
--- a/shell/hush_test/hush-misc/for_with_bslashes.tests
+++ b/shell/hush_test/hush-misc/for_with_bslashes.tests
@@ -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\ 3#\ 3c'
+# last word contains ^C character.
+for a in 'a' 'b\c' 'b\\c' 'b"c' "b'c" 'b$c' 'b`true`c' 'b\ 3#\ 3c'
 do
     echo $a
 done