mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-12-29 19:12:20 +01:00
Code Releases Activity

33286: handle redirections for multiply named functions

Browse source
This commit is contained in:
Peter Stephenson 2014-09-29 21:31:37 +01:00
parent cf6b0f5663
commit 8cb67e721b
3 changed files with 35 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2014-09-29 Peter Stephenson <p.w.stephenson@ntlworld.com>
* 33286: Src/exec.c, Test/A04redirect.ztst: handle redirections
for multiple named functions.
* 33285: NEWS, Src/exec.c, Src/hashtable.c, Src/parse.c,
Src/signals.c, Src/zsh.h, Test/A04redirect.ztst: redirections in
function definitions are applied at execution not definition.

17
Src/exec.c
View file

@ -4306,6 +4306,7 @@ execfuncdef(Estate state, Eprog redir_prog)
Shfunc shf;
char *s = NULL;
int signum, nprg, sbeg, nstrs, npats, len, plen, i, htok = 0, ret = 0;
int nfunc = 0;
Wordcode beg = state->pc, end;
Eprog prog;
Patprog *pp;
@ -4330,6 +4331,8 @@ execfuncdef(Estate state, Eprog redir_prog)
}
}
DPUTS(!names && redir_prog,
"Passing redirection to anon function definition.");
while (!names || (s = (char *) ugetnode(names))) {
if (!names) {
prog = (Eprog) zhalloc(sizeof(*prog));
@ -4371,7 +4374,15 @@ execfuncdef(Estate state, Eprog redir_prog)
shf->node.flags = 0;
shf->filename = ztrdup(scriptfilename);
shf->lineno = lineno;
shf->redir = redir_prog;
/*
* redir_prog is permanently allocated --- but if
* this function has multiple names we need an additional
* one.
*/
if (nfunc++ && redir_prog)
shf->redir = dupeprog(redir_prog, 0);
else
shf->redir = redir_prog;
shfunc_set_sticky(shf);
if (!names) {
@ -4427,6 +4438,10 @@ execfuncdef(Estate state, Eprog redir_prog)
shfunctab->addnode(shfunctab, ztrdup(s), shf);
}
}
if (!nfunc && redir_prog) {
/* For completeness, shouldn't happen */
freeeprog(redir_prog);
}
state->pc = end;
return ret;
}

16
Test/A04redirect.ztst
View file

@ -491,3 +491,19 @@
> print I want to tell you about $var
> print Also, this might be an error >&2
>} < input2 > output2 2>&1
1func 2func 3func() { print Ich heisse $0 } >output3
for i in 1 2 3; do
f=${i}func
print Running $f
$f
cat output3
unfunction $f
done
0:multiply named functions with redirection
>Running 1func
>Ich heisse 1func
>Running 2func
>Ich heisse 2func
>Running 3func
>Ich heisse 3func