diff options
| author | simonmar <unknown> | 2000-05-15 09:20:11 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2000-05-15 09:20:11 +0000 |
| commit | 89d2a24fe5be9800eb6ef0831832cba6355face5 (patch) | |
| tree | 2082dc4c0bc8a7bbfc767ce4d708b180d6a66234 /ghc/lib/std/cbits/openFile.c | |
| parent | ddf58515aacce0e7e22f73c5d0a1c04b8677e9aa (diff) | |
| download | haskell-89d2a24fe5be9800eb6ef0831832cba6355face5.tar.gz | |
[project @ 2000-05-15 09:20:11 by simonmar]
back out previous misguided commit.
Diffstat (limited to 'ghc/lib/std/cbits/openFile.c')
| -rw-r--r-- | ghc/lib/std/cbits/openFile.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/ghc/lib/std/cbits/openFile.c b/ghc/lib/std/cbits/openFile.c index 57b0c2ff84..66f7eab686 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.17 2000/05/11 13:15:38 simonmar Exp $ + * $Id: openFile.c,v 1.18 2000/05/15 09:20:11 simonmar Exp $ * * openFile Runtime Support */ @@ -94,22 +94,22 @@ openFile(StgByteArray file, StgInt how, StgInt binary) switch (how) { case OPENFILE_APPEND: - oflags = O_WRONLY | O_NOCTTY | O_APPEND; + oflags = O_NONBLOCK | O_WRONLY | O_NOCTTY | O_APPEND; for_writing = 1; flags |= FILEOBJ_WRITE; break; case OPENFILE_WRITE: - oflags = O_WRONLY | O_NOCTTY; + oflags = O_NONBLOCK | O_WRONLY | O_NOCTTY; flags |= FILEOBJ_WRITE; for_writing = 1; break; case OPENFILE_READ_ONLY: - oflags = O_RDONLY | O_NOCTTY; + oflags = O_NONBLOCK | O_RDONLY | O_NOCTTY; flags |= FILEOBJ_READ; for_writing = 0; break; case OPENFILE_READ_WRITE: - oflags = O_RDWR | O_NOCTTY; + oflags = O_NONBLOCK | O_RDWR | O_NOCTTY; flags |= FILEOBJ_READ | FILEOBJ_WRITE; for_writing = 1; break; @@ -191,17 +191,8 @@ openFile(StgByteArray file, StgInt how, StgInt binary) } } - /* Set non-blocking mode *after* the open. The reason is that - * when reading from a FIFO, if we open in non-blocking mode - * then any reads from the FIFO will return EOF straight away - * without waiting for a writing process. If we set O_NONBLOCK - * after doing the open, then we apparently get to wait for a - * writer. This broken behaviour has been observed on both Linux - * & Solaris. --SDM - */ - fcntl(fd, F_SETFL, oflags | O_NONBLOCK); - /* Make sure that we aren't looking at a directory */ + while (fstat(fd, &sb) < 0) { /* highly unlikely */ if (errno != EINTR) { |