Mercurial > hg > octave-nkf > gnulib-hg
changeset 15506:72af71b55124
fseeko: remove unneeded hack
Now that the fixed fseeko doesn't fail, we can remove the hack
that was previously making the testsuite pass.
* tests/test-fflush2.c (main): Don't special-case SEEK_END.
Signed-off-by: Eric Blake <eblake@redhat.com>
author | Eric Blake <eblake@redhat.com> |
---|---|
date | Tue, 09 Aug 2011 15:50:12 -0600 |
parents | 225d7e86ab78 |
children | 51db8ea94368 |
files | ChangeLog lib/fseeko.c |
diffstat | 2 files changed, 8 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2011-08-09 Eric Blake <eblake@redhat.com> + fseeko: remove unneeded hack + * tests/test-fflush2.c (main): Don't special-case SEEK_END. + fseeko: fix bug on glibc * lib/fseeko.c (fseeko): Set stream offset to match fd offset. Reported by John W. Eaton.
--- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -93,14 +93,10 @@ #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib." #endif { - /* We get here when an fflush() call immediately preceded this one. We - know there are no buffers. - POSIX requires us to modify the file descriptor's position. - But we cannot position beyond end of file here. */ - off_t pos = - lseek (fileno (fp), - whence == SEEK_END && offset > 0 ? 0 : offset, - whence); + /* We get here when an fflush() call immediately preceded this one (or + if ftell() has created buffers but no I/O has occurred on a + newly-opened stream). We know there are no buffers. */ + off_t pos = lseek (fileno (fp), offset, whence); if (pos == -1) { #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */ @@ -141,10 +137,7 @@ fp->__offset = pos; fp->__eof = 0; #endif - /* If we were not requested to position beyond end of file, we're - done. */ - if (!(whence == SEEK_END && offset > 0)) - return 0; + return 0; } return fseeko (fp, offset, whence); }