mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-19 03:31:14 +02:00
Code Releases Activity

unposted: fix init_io() calls in previous change

Browse source
This commit is contained in:
Peter Stephenson 2015-12-04 09:42:35 +00:00
parent fc00e3a6b7
commit 04479a56e0
5 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -1,5 +1,8 @@
2015-12-04 Peter Stephenson <p.stephenson@samsung.com> 2015-12-04 Peter Stephenson <p.stephenson@samsung.com>
* unposted: Src/exec.c, Src/init.c: fix up init_io() calls
in previous change.
* 37294: Doc/Zsh/params.yo, Src/init.c: Add $ZSH_EXECUTION_STRING * 37294: Doc/Zsh/params.yo, Src/init.c: Add $ZSH_EXECUTION_STRING
to give argument to shell -c option. to give argument to shell -c option.

2
Src/Modules/clone.c
View file

@ -93,7 +93,7 @@ bin_clone(char *nam, char **args, UNUSED(Options ops), UNUSED(int func))
/* Clear mygrp so that acquire_pgrp() gets the new process group. /* Clear mygrp so that acquire_pgrp() gets the new process group.
* (acquire_pgrp() is called from init_io()) */ * (acquire_pgrp() is called from init_io()) */
mypgrp = 0; mypgrp = 0;
init_io(); init_io(NULL);
setsparam("TTY", ztrdup(ttystrname)); setsparam("TTY", ztrdup(ttystrname));
} }
close(ttyfd); close(ttyfd);

2
Src/Modules/zpty.c
View file

@ -399,7 +399,7 @@ newptycmd(char *nam, char *pname, char **args, int echo, int nblock)
close(master); close(master);
close(coprocin); close(coprocin);
close(coprocout); close(coprocout);
init_io(); init_io(NULL);
setsparam("TTY", ztrdup(ttystrname)); setsparam("TTY", ztrdup(ttystrname));
opts[INTERACTIVE] = 0; opts[INTERACTIVE] = 0;

2
Src/exec.c
View file

@ -3225,7 +3225,7 @@ execcmd(Estate state, int input, int output, int how, int last1)
* not terminal, unless `file' is a terminal. */ * not terminal, unless `file' is a terminal. */
if (nullexec == 1 && fn->fd1 == 0 && if (nullexec == 1 && fn->fd1 == 0 &&
isset(SHINSTDIN) && interact && !zleactive) isset(SHINSTDIN) && interact && !zleactive)
init_io(); init_io(NULL);
break; break;
case REDIR_CLOSE: case REDIR_CLOSE:
if (fn->varid) { if (fn->varid) {

2
Src/init.c
View file

@ -519,6 +519,8 @@ init_io(char *cmd)
for (i = 3; i < 10; i++) for (i = 3; i < 10; i++)
close(i); close(i);
} }
#else
(void)cmd;
#endif #endif
if (shout) { if (shout) {