This is the mail archive of the
libc-alpha@sources.redhat.com
mailing list for the glibc project.
[PATCH] Further ftell{,o,o64}, fgetpos{,64} fix
- From: Jakub Jelinek <jakub at redhat dot com>
- To: Ulrich Drepper <drepper at redhat dot com>, Roland McGrath <roland at redhat dot com>
- Cc: libc-alpha at sources dot redhat dot com
- Date: Thu, 4 Nov 2004 16:41:38 -0500
- Subject: [PATCH] Further ftell{,o,o64}, fgetpos{,64} fix
- Reply-to: Jakub Jelinek <jakub at redhat dot com>
Hi!
IMHO if _IO_seekoff_unlocked returns _IO_pos_BAD (e.g. because lseek
failed), we shouldn't subtract anything from it and just return EIO error.
The ftell change is cosmetical on most platforms (perhaps with the exception
of FreeBSD) - if off_t is not long int, then the overflow check was wrong.
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.
--- libc/libio/ioftell.c.jj 2003-08-29 23:15:54.000000000 +0200
+++ libc/libio/ioftell.c 2004-11-04 22:30:35.926018236 +0100
@@ -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);
--- libc/libio/oldiofgetpos64.c.jj 2004-03-10 10:31:58.000000000 +0100
+++ libc/libio/oldiofgetpos64.c 2004-11-04 22:27:38.075571880 +0100
@@ -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)
--- libc/libio/iofgetpos64.c.jj 2003-09-02 11:27:01.000000000 +0200
+++ libc/libio/iofgetpos64.c 2004-11-04 22:29:54.297410153 +0100
@@ -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;
--- libc/libio/iofgetpos.c.jj 2003-08-29 23:15:54.000000000 +0200
+++ libc/libio/iofgetpos.c 2004-11-04 22:30:00.781259069 +0100
@@ -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;
--- libc/libio/oldiofgetpos.c.jj 2004-03-10 10:31:58.000000000 +0100
+++ libc/libio/oldiofgetpos.c 2004-11-04 22:27:24.223026452 +0100
@@ -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)
--- libc/libio/ftello64.c.jj 2003-08-29 23:15:53.000000000 +0200
+++ libc/libio/ftello64.c 2004-11-04 22:30:15.359670623 +0100
@@ -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;
--- libc/libio/ftello.c.jj 2003-08-29 23:15:53.000000000 +0200
+++ libc/libio/ftello.c 2004-11-04 22:30:21.711542686 +0100
@@ -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;
Jakub