diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2016-08-12 00:55:32 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2016-08-12 00:55:32 -0700 |
| commit | 68e14c41f28e54aef90e580411dda2385a69f43f (patch) | |
| tree | 1a398a9a73e9da43ced852bc94d9d2ff1ceaa4c8 /Src/subst.c | |
| parent | 4234fccef6489c9623b2226629d1bc3235d5893a (diff) | |
| download | zsh-68e14c41f28e54aef90e580411dda2385a69f43f.tar.gz zsh-68e14c41f28e54aef90e580411dda2385a69f43f.zip | |
39028: more join/split cases fixed and tested.
Diffstat (limited to 'Src/subst.c')
| -rw-r--r-- | Src/subst.c | 7 |
1 files changed, 4 insertions, 3 deletions
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; } } |