diff options
Diffstat (limited to 'libio')
| -rw-r--r-- | libio/ftello.c | 5 | ||||
| -rw-r--r-- | libio/ftello64.c | 5 | ||||
| -rw-r--r-- | libio/iofgetpos.c | 5 | ||||
| -rw-r--r-- | libio/iofgetpos64.c | 5 | ||||
| -rw-r--r-- | libio/ioftell.c | 7 | ||||
| -rw-r--r-- | libio/oldiofgetpos.c | 2 | ||||
| -rw-r--r-- | libio/oldiofgetpos64.c | 2 |
7 files changed, 18 insertions, 13 deletions
diff --git a/libio/ftello.c b/libio/ftello.c index 4975a0bd73..e58daacad4 100644 --- a/libio/ftello.c +++ b/libio/ftello.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-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 @@ -39,7 +40,7 @@ ftello (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 (fp->_mode <= 0) pos -= fp->_IO_save_end - fp->_IO_save_base; diff --git a/libio/ftello64.c b/libio/ftello64.c index 0275c0ca35..d39fc2d1b2 100644 --- a/libio/ftello64.c +++ b/libio/ftello64.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-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 @@ -40,7 +41,7 @@ ftello64 (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 (fp->_mode <= 0) pos -= fp->_IO_save_end - fp->_IO_save_base; diff --git a/libio/iofgetpos.c b/libio/iofgetpos.c index aff39bbed4..8b7ef9f34d 100644 --- a/libio/iofgetpos.c +++ b/libio/iofgetpos.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-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 @@ -40,7 +41,7 @@ _IO_new_fgetpos (fp, posp) CHECK_FILE (fp, EOF); _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 (fp->_mode <= 0) pos -= fp->_IO_save_end - fp->_IO_save_base; diff --git a/libio/iofgetpos64.c b/libio/iofgetpos64.c index be224ca103..10446857e7 100644 --- a/libio/iofgetpos64.c +++ b/libio/iofgetpos64.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1993, 1995-2001, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1993, 1995-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 @@ -41,7 +42,7 @@ _IO_new_fgetpos64 (fp, posp) CHECK_FILE (fp, EOF); _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 (fp->_mode <= 0) pos -= fp->_IO_save_end - fp->_IO_save_base; 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); diff --git a/libio/oldiofgetpos.c b/libio/oldiofgetpos.c index fbac21bdd4..6b14e1970f 100644 --- a/libio/oldiofgetpos.c +++ b/libio/oldiofgetpos.c @@ -42,7 +42,7 @@ _IO_old_fgetpos (fp, posp) CHECK_FILE (fp, EOF); _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) pos -= fp->_IO_save_end - fp->_IO_save_base; _IO_release_lock (fp); if (pos == _IO_pos_BAD) diff --git a/libio/oldiofgetpos64.c b/libio/oldiofgetpos64.c index 996ad2075b..1c1adb3884 100644 --- a/libio/oldiofgetpos64.c +++ b/libio/oldiofgetpos64.c @@ -43,7 +43,7 @@ _IO_old_fgetpos64 (fp, posp) CHECK_FILE (fp, EOF); _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) pos -= fp->_IO_save_end - fp->_IO_save_base; _IO_release_lock (fp); if (pos == _IO_pos_BAD) |