diff options
| author | Peter Stephenson <pws@zsh.org> | 2015-12-04 09:42:35 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@zsh.org> | 2015-12-04 09:42:35 +0000 |
| commit | 04479a56e09b92b893230c715e434f95e77c09b5 (patch) | |
| tree | 1abdbe007a014f33230afe302e4007c62360653e | |
| parent | fc00e3a6b79862be1b605279615fe88259d70799 (diff) | |
| download | zsh-04479a56e09b92b893230c715e434f95e77c09b5.tar.gz zsh-04479a56e09b92b893230c715e434f95e77c09b5.tar.xz zsh-04479a56e09b92b893230c715e434f95e77c09b5.zip | |
unposted: fix init_io() calls in previous change
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/Modules/clone.c | 2 | ||||
| -rw-r--r-- | Src/Modules/zpty.c | 2 | ||||
| -rw-r--r-- | Src/exec.c | 2 | ||||
| -rw-r--r-- | Src/init.c | 2 |
5 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 9b5a8d2fa..2b9dfdf5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/Src/Modules/clone.c b/Src/Modules/clone.c index 5db1c9222..930429248 100644 --- a/Src/Modules/clone.c +++ b/Src/Modules/clone.c @@ -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); diff --git a/Src/Modules/zpty.c b/Src/Modules/zpty.c index 3b8366076..02708a915 100644 --- a/Src/Modules/zpty.c +++ b/Src/Modules/zpty.c @@ -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; diff --git a/Src/exec.c b/Src/exec.c index c0ee527b7..fc31c6be0 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -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) { diff --git a/Src/init.c b/Src/init.c index 789489332..4097327ee 100644 --- a/Src/init.c +++ b/Src/init.c @@ -519,6 +519,8 @@ init_io(char *cmd) for (i = 3; i < 10; i++) close(i); } +#else + (void)cmd; #endif if (shout) { |