diff options
| author | Roland McGrath <roland@gnu.org> | 2004-11-04 23:22:02 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 2004-11-04 23:22:02 +0000 |
| commit | 3447be7bb303c1cf4d10fd059babc9681df0123b (patch) | |
| tree | 4390a65ae096f254db64de2e488cea5fd489c10b /libio/ioftell.c | |
| parent | a129c4fe7280cad19502bd220a3fe95497553cf5 (diff) | |
| download | glibc-3447be7bb303c1cf4d10fd059babc9681df0123b.tar.gz glibc-3447be7bb303c1cf4d10fd059babc9681df0123b.tar.xz glibc-3447be7bb303c1cf4d10fd059babc9681df0123b.zip | |
2004-11-04 Jakub Jelinek <jakub@redhat.com>
* libio/ftello.c (ftello): Don't subtract save_end - save_base if pos is _IO_pos_BAD. * libio/ftello64.c (ftello64): Likewise. * libio/iofgetpos.c (_IO_new_fgetpos): Likewise. * libio/iofgetpos64.c (_IO_new_fgetpos64): Likewise. * libio/oldiofgetpos.c (_IO_old_fgetpos): Likewise. * libio/oldiofgetpos64.c (_IO_old_fgetpos64): Likewise. * libio/ioftell.c (_IO_ftell): Likewise. Cast to long int instead of off_t when checking for overflow.
Diffstat (limited to 'libio/ioftell.c')
| -rw-r--r-- | libio/ioftell.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libio/ioftell.c b/libio/ioftell.c index b991ef69ea..03e5f28404 100644 --- a/libio/ioftell.c +++ b/libio/ioftell.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993,1995-2000,2001,2002,2003 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-2000, 2001, 2002, 2003, 2004 + 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 @@ -38,7 +39,7 @@ _IO_ftell (fp) CHECK_FILE (fp, -1L); _IO_acquire_lock (fp); pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0); - if (_IO_in_backup (fp)) + if (_IO_in_backup (fp) && pos != _IO_pos_BAD) { if (_IO_vtable_offset (fp) != 0 || fp->_mode <= 0) pos -= fp->_IO_save_end - fp->_IO_save_base; @@ -52,7 +53,7 @@ _IO_ftell (fp) #endif return -1L; } - if ((_IO_off64_t) (off_t) pos != pos) + if ((_IO_off64_t) (long int) pos != pos) { #ifdef EOVERFLOW __set_errno (EOVERFLOW); |