mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-24 05:11:08 +02:00
Code Releases Activity

29367, 29368: avoid redirecting the xtrace of simple commands along with

Browse source 
their standard error.
This commit is contained in:
Bart Schaefer 2011-05-24 15:49:03 +00:00
parent 52ab943585
commit e39dfaeb95
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,14 @@
2011-05-24 Barton E. Schaefer <schaefer@brasslantern.com>
* 29368: Src/exec.c: do not restore xtrerr to stderr before
running simple commands; restore xtrerr to stderr just before
running a function body, but after printing the trace of
the function call itself.
* 29367: Test/E02xtrace.ztst: update tests to fix mistaken
assumptions introduced by 25154 and add check of redirection
inside a function body.
2011-05-24 Mikael Magnusson <mikachu@gmail.com> 2011-05-24 Mikael Magnusson <mikachu@gmail.com>
* 29364: Completion/Unix/Command/_make: Partial fix for * 29364: Completion/Unix/Command/_make: Partial fix for
@ -14803,5 +14814,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5325 $ * $Revision: 1.5326 $
***************************************************** *****************************************************

2
Src/exec.c
View file

@ -3079,7 +3079,6 @@ execcmd(Estate state, int input, int output, int how, int last1)
if (mfds[i] && mfds[i]->ct >= 2) if (mfds[i] && mfds[i]->ct >= 2)
closemn(mfds, i); closemn(mfds, i);
xtrerr = stderr;
if (nullexec) { if (nullexec) {
if (nullexec == 1) { if (nullexec == 1) {
/* /*
@ -4260,6 +4259,7 @@ execshfunc(Shfunc shf, LinkList args)
cmdsp = 0; cmdsp = 0;
if ((osfc = sfcontext) == SFC_NONE) if ((osfc = sfcontext) == SFC_NONE)
sfcontext = SFC_DIRECT; sfcontext = SFC_DIRECT;
xtrerr = stderr;
doshfunc(shf, args, 0); doshfunc(shf, args, 0);
sfcontext = osfc; sfcontext = osfc;
free(cmdstack); free(cmdstack);