Re: $* assignment regression in shwordsplit

[Bart Schaefer <schaefer@brasslantern.com>]

Hrm.  Well, we can do it this way instead, but that changes the effects
of ${(u)...} and and ${^...} in the expansion, requiring an extra level
of nested braces.

Obviously in the bit removed by this patch it's the wrong thing to join
up the entire input linklist.  I guess we'd need to join only the nodes
added around the input node n (plus turn off LF_ARRAY), but there's no
good way to keep track of that (?).  Maybe it would work to join up
everything to the left of n.  Anybody with a clearer idea what's going
on here care to interject?

Meanwhile this fixes the bug without failing the other related tests.

diff --git a/Src/subst.c b/Src/subst.c
index e639c96..5b1bf89 100644
--- a/Src/subst.c
+++ b/Src/subst.c
@@ -446,7 +446,7 @@ singsub(char **s)
  * NULL to use IFS).  The return value is true iff the expansion resulted
  * in an empty list.
  *
- * *ms_flags is set to bits in the enum above as neeed.
+ * *ms_flags is set to bits in the enum above as needed.
  */
 
 /**/
@@ -3779,6 +3779,13 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags,
      * as a scalar.)
      */
 
+    if (isarr && ssub) {
+	/* prefork() wants a scalar, so join no matter what else */
+	val = sepjoin(aval, NULL, 1);
+	isarr = 0;
+	l->list.flags &= ~LF_ARRAY;
+    }
+
     /*
      * If a multsub result had whitespace at the start and we're
      * splitting and there's a previous string, now's the time to do so.
@@ -4026,18 +4033,6 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags,
 	    y = dupstring(nulstring);
 	setdata(n, (void *) y);
     }
-    if (isarr && ssub) {
-	/* prefork() wants a scalar, so join no matter what else */
-	LinkNode tn;
-
-	aval = hlinklist2array(l, 0);
-	val = sepjoin(aval, NULL, 1);
-	n = firstnode(l);
-	for (tn = lastnode(l); tn && tn != n; tn = lastnode(l))
-	    uremnode(l, tn);
-	setdata(n, (void *) val);
-	l->list.flags &= ~LF_ARRAY;
-    }
     if (eval)
 	*str = (char *) getdata(n);