summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Stephenson <p.w.stephenson@ntlworld.com>2020-06-08 20:52:53 +0100
committerPeter Stephenson <p.w.stephenson@ntlworld.com>2020-06-08 20:52:53 +0100
commitd7e90f1c7c08ab88c6e0e7c68e64f0e1ea51893d (patch)
treed38247885419f679e4d63efd3c4f3a270e21b9ea
parentaa7b62e3faca1fe0e6d47d6706280ff67694cff5 (diff)
downloadzsh-d7e90f1c7c08ab88c6e0e7c68e64f0e1ea51893d.tar.gz
zsh-d7e90f1c7c08ab88c6e0e7c68e64f0e1ea51893d.zip
users/24909: Don't clean up special file list too early.
When running a function, remove special files used for substitution after the function has run rather than before.
-rw-r--r--ChangeLog5
-rw-r--r--Src/exec.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 42060024b..979fa729b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-06-08 Peter Stephenson <p.w.stephenson@ntlworld.com>
+
+ * uwers/24909: Src/exec.c: Don't clean up files used for
+ substitution until after function has run.
+
2020-06-08 Doron Behar <doron.behar@gmail.com>
* gitlab !14 (fixup): Completion/Linux/Command/_modutils:
diff --git a/Src/exec.c b/Src/exec.c
index 29f4fc5ca..c72d485b2 100644
--- a/Src/exec.c
+++ b/Src/exec.c
@@ -3969,8 +3969,8 @@ execcmd_exec(Estate state, Execcmd_params eparams,
if (is_shfunc) {
/* It's a shell function */
- pipecleanfilelist(filelist, 0);
execshfunc((Shfunc) hn, args);
+ pipecleanfilelist(filelist, 0);
} else {
/* It's a builtin */
LinkList assigns = (LinkList)0;