diff options
| author | Takashi Yano <takashi.yano@nifty.ne.jp> | 2021-11-17 12:39:04 +0900 |
|---|---|---|
| committer | Takashi Yano <takashi.yano@nifty.ne.jp> | 2021-11-18 02:58:54 +0900 |
| commit | 8c1bbf2f2c50ba86f1ad607645f93af65c8b308d (patch) | |
| tree | db94436fbcc4e4c7d92c2d383a1dad3e7138ceb4 | |
| parent | b959a543216f25c8258bb615373a900ac39fe7bc (diff) | |
| download | newlib-8c1bbf2f2c50ba86f1ad607645f93af65c8b308d.zip newlib-8c1bbf2f2c50ba86f1ad607645f93af65c8b308d.tar.gz newlib-8c1bbf2f2c50ba86f1ad607645f93af65c8b308d.tar.bz2 | |
Cygwin: pipe: Suppress unnecessary set_pipe_non_blocking() call.
- Call set_pipe_non_blocking(false) only if the pipe will be really
inherited to non-cygwin process.
| -rw-r--r-- | winsup/cygwin/spawn.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 6b20267..e160fa3 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -648,8 +648,9 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, if (!iscygwin ()) { + int fd; cfd.rewind (); - while (cfd.next () >= 0) + while ((fd = cfd.next ()) >= 0) if (cfd->get_major () == DEV_PTYS_MAJOR) { fhandler_pty_slave *ptys = @@ -657,13 +658,15 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv, ptys->create_invisible_console (); ptys->setup_locale (); } - else if (cfd->get_dev () == FH_PIPEW) + else if (cfd->get_dev () == FH_PIPEW + && (fd == (in__stdout < 0 ? 1 : in__stdout) || fd == 2)) { fhandler_pipe *pipe = (fhandler_pipe *)(fhandler_base *) cfd; pipe->close_query_handle (); pipe->set_pipe_non_blocking (false); } - else if (cfd->get_dev () == FH_PIPER) + else if (cfd->get_dev () == FH_PIPER + && fd == (in__stdin < 0 ? 0 : in__stdin)) { fhandler_pipe *pipe = (fhandler_pipe *)(fhandler_base *) cfd; pipe->set_pipe_non_blocking (false); |