mirror of
git://git.code.sf.net/p/zsh/code
synced 2025-01-01 05:16:05 +01:00
unposted: fix init_io() calls in previous change
This commit is contained in:
parent
fc00e3a6b7
commit
04479a56e0
5 changed files with 8 additions and 3 deletions
|
@ -1,5 +1,8 @@
|
|||
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
|
||||
to give argument to shell -c option.
|
||||
|
||||
|
|
|
@ -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.
|
||||
* (acquire_pgrp() is called from init_io()) */
|
||||
mypgrp = 0;
|
||||
init_io();
|
||||
init_io(NULL);
|
||||
setsparam("TTY", ztrdup(ttystrname));
|
||||
}
|
||||
close(ttyfd);
|
||||
|
|
|
@ -399,7 +399,7 @@ newptycmd(char *nam, char *pname, char **args, int echo, int nblock)
|
|||
close(master);
|
||||
close(coprocin);
|
||||
close(coprocout);
|
||||
init_io();
|
||||
init_io(NULL);
|
||||
setsparam("TTY", ztrdup(ttystrname));
|
||||
|
||||
opts[INTERACTIVE] = 0;
|
||||
|
|
|
@ -3225,7 +3225,7 @@ execcmd(Estate state, int input, int output, int how, int last1)
|
|||
* not terminal, unless `file' is a terminal. */
|
||||
if (nullexec == 1 && fn->fd1 == 0 &&
|
||||
isset(SHINSTDIN) && interact && !zleactive)
|
||||
init_io();
|
||||
init_io(NULL);
|
||||
break;
|
||||
case REDIR_CLOSE:
|
||||
if (fn->varid) {
|
||||
|
|
|
@ -519,6 +519,8 @@ init_io(char *cmd)
|
|||
for (i = 3; i < 10; i++)
|
||||
close(i);
|
||||
}
|
||||
#else
|
||||
(void)cmd;
|
||||
#endif
|
||||
|
||||
if (shout) {
|
||||
|
|
Loading…
Reference in a new issue