about summary refs log tree commit diff
path: root/Src
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2012-02-29 09:57:40 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2012-02-29 09:57:40 +0000
commit6f93994a5aeb3a8290153ec159af35bbd96a6673 (patch)
treea6a682ebf0479364be21d2d74a4ee28d4dad9b4c /Src
parentd0d0490c67c34a4e73913e743b9e0602e33f6f9f (diff)
downloadzsh-6f93994a5aeb3a8290153ec159af35bbd96a6673.tar.gz
zsh-6f93994a5aeb3a8290153ec159af35bbd96a6673.tar.xz
zsh-6f93994a5aeb3a8290153ec159af35bbd96a6673.zip
30299: "$*" was split with SHWORDSPLIT if IFS was empty or unset
Diffstat (limited to 'Src')
-rw-r--r--Src/subst.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Src/subst.c b/Src/subst.c
index b9229861b..04ef1a4fb 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -1649,7 +1649,7 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags)
      * This is one of the things that decides whether multsub
      * will produce an array, but in an extremely indirect fashion.
      */
-    int nojoin = (pf_flags & PREFORK_SHWORDSPLIT) ? !(ifs && *ifs) : 0;
+    int nojoin = (pf_flags & PREFORK_SHWORDSPLIT) ? !(ifs && *ifs) && !qt : 0;
     /*
      * != 0 means ${...}, otherwise $...  What works without braces
      * is largely a historical artefact (everything works with braces,