projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1999-11-05 15:25:49 by simonmar]
[ghc-hetmet.git]
/
ghc
/
lib
/
std
/
cbits
/
readFile.c
diff --git
a/ghc/lib/std/cbits/readFile.c
b/ghc/lib/std/cbits/readFile.c
index
7445b3e
..
c47b56c
100644
(file)
--- a/
ghc/lib/std/cbits/readFile.c
+++ b/
ghc/lib/std/cbits/readFile.c
@@
-1,7
+1,7
@@
/*
* (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
*
/*
* (c) The GRASP/AQUA Project, Glasgow University, 1994-1998
*
- * $Id: readFile.c,v 1.7 1999/07/12 10:43:13 sof Exp $
+ * $Id: readFile.c,v 1.8 1999/09/16 13:14:43 simonmar Exp $
*
* hGetContents Runtime Support
*/
*
* hGetContents Runtime Support
*/
@@
-77,9
+77,6
@@
StgForeignPtr ptr;
fprintf(stderr, "rb: %d %d %d\n", fo->bufRPtr, fo->bufWPtr, fo->bufSize);
#endif
fprintf(stderr, "rb: %d %d %d\n", fo->bufRPtr, fo->bufWPtr, fo->bufSize);
#endif
- if ( fo->flags & FILEOBJ_NONBLOCKING_IO && inputReady (ptr,0) != 1 )
- return FILEOBJ_BLOCKED_READ;
-
while ((count =
(
#ifdef USE_WINSOCK
while ((count =
(
#ifdef USE_WINSOCK
@@
-170,9
+167,6
@@
StgInt len;
p += count;
total_count = count;
p += count;
total_count = count;
- if ( fo->flags & FILEOBJ_NONBLOCKING_IO && inputReady (ptr,0) != 1 )
- return FILEOBJ_BLOCKED_READ;
-
while ((count =
(
#ifdef USE_WINSOCK
while ((count =
(
#ifdef USE_WINSOCK
@@
-317,9
+311,6
@@
StgForeignPtr ptr;
}
fo->flags = (fo->flags & ~FILEOBJ_RW_WRITE) | FILEOBJ_RW_READ;
}
fo->flags = (fo->flags & ~FILEOBJ_RW_WRITE) | FILEOBJ_RW_READ;
- if ( fo->flags & FILEOBJ_NONBLOCKING_IO && inputReady (ptr,0) != 1 )
- return FILEOBJ_BLOCKED_READ;
-
while ( (count =
(
#ifdef USE_WINSOCK
while ( (count =
(
#ifdef USE_WINSOCK