ash: fix arithmetic closing )) split by backslash-newline

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

diff --git a/shell/ash.c b/shell/ash.c
index b71fc02990d47ea45fc2f8c92d14486432e27acb..97f8d9377759fa5bdb8cec0541925d790f7d5ca7 100644 (file)
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -11437,7 +11437,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                        if (parenlevel > 0) {
                                parenlevel--;
                        } else {
-                               if (pgetc() == ')') {
+                               if (pgetc_eatbnl() == ')') {
                                        c = CTLENDARI;
                                        if (--arinest == 0) {
                                                syntax = prevsyntax;
@@ -11464,6 +11464,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                        if (varnest == 0) {
 #if ENABLE_ASH_BASH_COMPAT
                                if (c == '&') {
+//Can't call pgetc_eatbnl() here, this requires three-deep pungetc()
                                        if (pgetc() == '>')
                                                c = 0x100 + '>'; /* flag &> */
                                        pungetc();

diff --git a/shell/ash_test/ash-vars/var_unbackslash1.right b/shell/ash_test/ash-vars/var_unbackslash1.right
index 8d4eca34ed031537bd6b856648cf83c7ea862317..3e0c0e2af07e430cace25c61082e692c8f98323f 100644 (file)
--- a/shell/ash_test/ash-vars/var_unbackslash1.right
+++ b/shell/ash_test/ash-vars/var_unbackslash1.right
@@ -1,3 +1,7 @@
 Ok
 Ba d
 Ok
+Ok
+Ok
+Forty two:42
+Forty two:42

diff --git a/shell/ash_test/ash-vars/var_unbackslash1.tests b/shell/ash_test/ash-vars/var_unbackslash1.tests
index 8a9f2e2498b296b61bcb652b101eba177f6e1405..cddd8ae5e1ca6422bad3e7881ed5d7c60ec7a5e1 100755 (executable)
--- a/shell/ash_test/ash-vars/var_unbackslash1.tests
+++ b/shell/ash_test/ash-vars/var_unbackslash1.tests
@@ -13,3 +13,23 @@ d'
 eval $e
 # "Ok"
 eval "$e"
+
+echo $\
+(echo Ok\
+)
+echo "$\
+(echo Ok\
+)"
+
+echo Forty two:$\
+(\
+(\
+42\
+)\
+)
+echo "Forty two:$\
+(\
+(\
+42\
+)\
+)"
\ No newline at end of file

diff --git a/shell/hush_test/hush-vars/var_unbackslash1.right b/shell/hush_test/hush-vars/var_unbackslash1.right
index 8d4eca34ed031537bd6b856648cf83c7ea862317..3e0c0e2af07e430cace25c61082e692c8f98323f 100644 (file)
--- a/shell/hush_test/hush-vars/var_unbackslash1.right
+++ b/shell/hush_test/hush-vars/var_unbackslash1.right
@@ -1,3 +1,7 @@
 Ok
 Ba d
 Ok
+Ok
+Ok
+Forty two:42
+Forty two:42

diff --git a/shell/hush_test/hush-vars/var_unbackslash1.tests b/shell/hush_test/hush-vars/var_unbackslash1.tests
index 8a9f2e2498b296b61bcb652b101eba177f6e1405..cddd8ae5e1ca6422bad3e7881ed5d7c60ec7a5e1 100755 (executable)
--- a/shell/hush_test/hush-vars/var_unbackslash1.tests
+++ b/shell/hush_test/hush-vars/var_unbackslash1.tests
@@ -13,3 +13,23 @@ d'
 eval $e
 # "Ok"
 eval "$e"
+
+echo $\
+(echo Ok\
+)
+echo "$\
+(echo Ok\
+)"
+
+echo Forty two:$\
+(\
+(\
+42\
+)\
+)
+echo "Forty two:$\
+(\
+(\
+42\
+)\
+)"
\ No newline at end of file