drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Takashi Yano 2021-11-17 12:39:04 +09:00
parent b959a54321
commit 8c1bbf2f2c
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
winsup/cygwin/spawn.cc
View File

@ -648,8 +648,9 @@ child_info_spawn::worker (const char *prog_arg, const char *const *argv,
if (!iscygwin ()) if (!iscygwin ())
{ {
int fd;
cfd.rewind (); cfd.rewind ();
while (cfd.next () >= 0) while ((fd = cfd.next ()) >= 0)
if (cfd->get_major () == DEV_PTYS_MAJOR) if (cfd->get_major () == DEV_PTYS_MAJOR)
{ {
fhandler_pty_slave *ptys = 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->create_invisible_console ();
ptys->setup_locale (); 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; fhandler_pipe *pipe = (fhandler_pipe *)(fhandler_base *) cfd;
pipe->close_query_handle (); pipe->close_query_handle ();
pipe->set_pipe_non_blocking (false); 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; fhandler_pipe *pipe = (fhandler_pipe *)(fhandler_base *) cfd;
pipe->set_pipe_non_blocking (false); pipe->set_pipe_non_blocking (false);