summaryrefslogtreecommitdiff
path: root/shell/ash.c
diff options
context:
space:
mode:
authorRon Yorston2016-04-03 22:43:14 +0100
committerDenys Vlasenko2016-04-15 22:16:46 +0200
commit84ba50c32f7dbfccddd5c5ca34d48d97c3f72193 (patch)
treedd2120def41d29e64d3a469edb26ece02f45724b /shell/ash.c
parent2b91958dff0b7bae83cf2c3f2db55bd248fe0956 (diff)
downloadbusybox-84ba50c32f7dbfccddd5c5ca34d48d97c3f72193.zip
busybox-84ba50c32f7dbfccddd5c5ca34d48d97c3f72193.tar.gz
ash: bash-compatible $'...' shouldn't expand in double quotes
Bash doesn't expand its $'...' construct in double quotes: $ echo "$'a\tb'" $'a\tb' Change BusyBox ash to do the same. This also fixes a problem with here documents where BusyBox ash gave an incorrect result for: $ cat <<EOF > '$' > EOF '$' Reported-by: Timo Teras <timo.teras@iki.fi> Signed-off-by: Ron Yorston <rmy@pobox.com> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell/ash.c')
-rw-r--r--shell/ash.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 13eeab3..da9c950 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -11500,7 +11500,7 @@ parsesub: {
|| (c != '(' && c != '{' && !is_name(c) && !is_special(c))
) {
#if ENABLE_ASH_BASH_COMPAT
- if (c == '\'')
+ if (syntax != DQSYNTAX && c == '\'')
bash_dollar_squote = 1;
else
#endif