diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2001-08-09 08:50:50 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2001-08-09 08:50:50 +0000 |
| commit | 40a982a9e1b825b175be7bc7c7199c6bdf363e4b (patch) | |
| tree | 7523a21da3e35bed6e56133efbe1d16dadb6e6da /libio/iofgetpos64.c | |
| parent | 0f78390bd799fc0b0394240a9a704591481ac8c6 (diff) | |
| download | glibc-40a982a9e1b825b175be7bc7c7199c6bdf363e4b.zip glibc-40a982a9e1b825b175be7bc7c7199c6bdf363e4b.tar.gz glibc-40a982a9e1b825b175be7bc7c7199c6bdf363e4b.tar.bz2 | |
Update.
2001-08-09 Ulrich Drepper <drepper@redhat.com>
* libio/wfileops.c (_IO_wfile_seekoff): Don't even try to handle
seeking with backup buffer present.
Correct determining of internal buffer position.
Reset also wide buffers if we reset the internal buffers.
* libio/iofwide.c (_IO_fwide): Always determine file offset for wide
streams.
* libio/ioseekoff.c: Catch one unimplemented case.
* libio/ftello.c: Don't abort if the wide stream has backup buffer.
* libio/ftello64.c: Likewise.
* libio/iofgetpos.c: Likewise.
* libio/iofgetpos64.c: Likewise.
* libio/ftell.c: Likewise.
* libio/Makefile (tests): Add tst-ungetwc2.
* libio/tst-ungetwc2.c: New file.
Diffstat (limited to 'libio/iofgetpos64.c')
| -rw-r--r-- | libio/iofgetpos64.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libio/iofgetpos64.c b/libio/iofgetpos64.c index 3f29337..1790718 100644 --- a/libio/iofgetpos64.c +++ b/libio/iofgetpos64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1993, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -42,7 +42,10 @@ _IO_new_fgetpos64 (fp, posp) _IO_flockfile (fp); pos = _IO_seekoff (fp, 0, _IO_seek_cur, 0); if (_IO_in_backup (fp)) - pos -= fp->_IO_save_end - fp->_IO_save_base; + { + if (fp->_mode <= 0) + pos -= fp->_IO_save_end - fp->_IO_save_base; + } _IO_funlockfile (fp); _IO_cleanup_region_end (0); if (pos == _IO_pos_BAD) |