From 68e14c41f28e54aef90e580411dda2385a69f43f Mon Sep 17 00:00:00 2001 From: "Barton E. Schaefer" Date: Fri, 12 Aug 2016 00:55:32 -0700 Subject: 39028: more join/split cases fixed and tested. --- Src/subst.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Src/subst.c') diff --git a/Src/subst.c b/Src/subst.c index ae3e4c40c..99e1650d0 100644 --- a/Src/subst.c +++ b/Src/subst.c @@ -3461,11 +3461,12 @@ paramsubst(LinkList l, LinkNode n, char **str, int qt, int pf_flags, val = sepjoin(aval, sep, 1); isarr = 0; ms_flags = 0; - } else if (force_split && nojoin == 2) { + } else if (force_split && (spsep || nojoin == 2)) { /* Hack to simulate splitting individual elements: - * first join on what we later use to split + * forced joining as previously determined, or + * join on what we later use to forcibly split */ - val = sepjoin(aval, spsep, 1); + val = sepjoin(aval, (nojoin == 1 ? sep : spsep), 1); isarr = 0; } } -- cgit v1.2.3