diff options
author | simonmar <unknown> | 1999-12-14 14:26:14 +0000 |
---|---|---|
committer | simonmar <unknown> | 1999-12-14 14:26:14 +0000 |
commit | 406aa1d7a33c2530bf61a7de9752cfbda22d21c2 (patch) | |
tree | 8ca6273a3598f88729e558a3da150c49827f8054 | |
parent | c37f2ebf59f23edd8fdd4c95d233b95f4e8cb0ef (diff) | |
download | haskell-406aa1d7a33c2530bf61a7de9752cfbda22d21c2.tar.gz |
[project @ 1999-12-14 14:26:14 by simonmar]
Don't set O_NONBLOCK on stdout and stderr. This is a workaround for a
combination of bizarre Unix semantics and shells which don't reset the
nonblocking flag after running a program.
-rw-r--r-- | ghc/lib/std/cbits/openFile.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/ghc/lib/std/cbits/openFile.c b/ghc/lib/std/cbits/openFile.c index 718f04efd2..3b827e5a53 100644 --- a/ghc/lib/std/cbits/openFile.c +++ b/ghc/lib/std/cbits/openFile.c @@ -1,7 +1,7 @@ /* * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998 * - * $Id: openFile.c,v 1.14 1999/12/08 15:47:08 simonmar Exp $ + * $Id: openFile.c,v 1.15 1999/12/14 14:26:14 simonmar Exp $ * * openFile Runtime Support */ @@ -48,14 +48,21 @@ openStdFile(StgInt fd, StgInt rd) fo->flags = FILEOBJ_STD | ( rd ? FILEOBJ_READ : FILEOBJ_WRITE); fo->connectedTo = NULL; - /* MS Win32 CRT doesn't support fcntl() -- the workaround is to - start using 'completion ports', but I'm punting on implementing - support for using those. - */ #if !defined(_WIN32) || defined(__CYGWIN__) || defined(__CYGWIN32__) - /* set the non-blocking flag on this file descriptor */ - fd_flags = fcntl(fd, F_GETFL); - fcntl(fd, F_SETFL, fd_flags | O_NONBLOCK); + /* Set the non-blocking flag on this file descriptor. + * + * Don't do it for stdout and stderr: some shells (actually most) + * don't reset the nonblocking flag after running a program, and + * this causes all sorts of problems. --SDM (12/99) + * + * MS Win32 CRT doesn't support fcntl() -- the workaround is to + * start using 'completion ports', but I'm punting on implementing + * support for using those. + */ + if (fd != 1 && fd != 2) { + fd_flags = fcntl(fd, F_GETFL); + fcntl(fd, F_SETFL, fd_flags | O_NONBLOCK); + } #endif return fo; |