summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko2018-04-02 13:29:20 +0200
committerDenys Vlasenko2018-04-02 13:29:20 +0200
commitc4c2012284c3a3a45843e9400379c84855d853ef (patch)
tree113aef7b5e6ac339a919faec68c935d679a74b02
parent8b536eb40d7b4e65e3a0223ada7246f538ac6e98 (diff)
downloadbusybox-c4c2012284c3a3a45843e9400379c84855d853ef.zip
busybox-c4c2012284c3a3a45843e9400379c84855d853ef.tar.gz
ash: parser: Fix single-quoted patterns in here-documents
Upstream commit: From: Herbert Xu <herbert@gondor.apana.org.au> Date: Fri, 9 Mar 2018 23:07:53 +0800 parser: Fix single-quoted patterns in here-documents The script x=* cat <<- EOF ${x#'*'} EOF prints * instead of nothing as it should. The problem is that when we're in sqsyntax context in a here-document, we won't add CTLESC as we should. This patch fixes it: Reported-by: Harald van Dijk <harald@gigawatt.nl> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--shell/ash.c2
-rw-r--r--shell/ash_test/ash-heredoc/heredoc_var_expand1.right4
-rwxr-xr-xshell/ash_test/ash-heredoc/heredoc_var_expand1.tests11
3 files changed, 16 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 97379cd..70a278f 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -12005,7 +12005,7 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
}
}
#endif
- if (eofmark == NULL || synstack->dblquote)
+ if (!eofmark || synstack->dblquote || synstack->varnest)
USTPUTC(CTLESC, out);
USTPUTC(c, out);
break;
diff --git a/shell/ash_test/ash-heredoc/heredoc_var_expand1.right b/shell/ash_test/ash-heredoc/heredoc_var_expand1.right
new file mode 100644
index 0000000..eb22183
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_var_expand1.right
@@ -0,0 +1,4 @@
+
+Ok1:0
+
+Ok2:0
diff --git a/shell/ash_test/ash-heredoc/heredoc_var_expand1.tests b/shell/ash_test/ash-heredoc/heredoc_var_expand1.tests
new file mode 100755
index 0000000..3b00bab
--- /dev/null
+++ b/shell/ash_test/ash-heredoc/heredoc_var_expand1.tests
@@ -0,0 +1,11 @@
+x='*'
+
+cat <<- EOF
+ ${x#'*'}
+EOF
+echo Ok1:$?
+
+cat <<EOF
+${x#'*'}
+EOF
+echo Ok2:$?