diff options
| author | rrt <unknown> | 2000-04-14 16:25:08 +0000 |
|---|---|---|
| committer | rrt <unknown> | 2000-04-14 16:25:08 +0000 |
| commit | f5ee88993b76cd344369a9a8d96ff9ffbcefed49 (patch) | |
| tree | 1a586b13b04f2cd0e62a1c291cfc68cc8bffd268 | |
| parent | b458760b18ca7d3e1e913eefbf8478eac34afb99 (diff) | |
| download | haskell-f5ee88993b76cd344369a9a8d96ff9ffbcefed49.tar.gz | |
[project @ 2000-04-14 16:25:08 by rrt]
Increased paranoia.
| -rw-r--r-- | ghc/lib/std/cbits/filePosn.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ghc/lib/std/cbits/filePosn.c b/ghc/lib/std/cbits/filePosn.c index c3832864db..bd1abce29a 100644 --- a/ghc/lib/std/cbits/filePosn.c +++ b/ghc/lib/std/cbits/filePosn.c @@ -1,7 +1,7 @@ /* * (c) The GRASP/AQUA Project, Glasgow University, 1994-1998 * - * $Id: filePosn.c,v 1.6 1999/12/08 15:47:07 simonmar Exp $ + * $Id: filePosn.c,v 1.7 2000/04/14 16:25:08 rrt Exp $ * * hGetPosn and hSetPosn Runtime Support */ @@ -19,7 +19,6 @@ StgForeignPtr ptr; { IOFileObject* fo = (IOFileObject*)ptr; off_t posn; - while ( (posn = lseek(fo->fd, 0, SEEK_CUR)) == -1) { if (errno != EINTR) { cvtErrno(); @@ -32,13 +31,14 @@ StgForeignPtr ptr; } else if (fo->flags & FILEOBJ_READ) { posn -= (fo->bufWPtr - fo->bufRPtr); #if defined(_WIN32) - if (!(fo->flags & FILEOBJ_BINARY)) { + if (fo->buf && !(fo->flags & FILEOBJ_BINARY)) { /* Sigh, to get at the Real file position for files opened in text mode, we need to scan the read buffer looking for '\n's, making them count as \r\n (i.e., undoing the work of read()), since lseek() returns the raw position. */ int i, j; + i = fo->bufRPtr; j = fo->bufWPtr; while (i <= j) { |