From b41a41b698a82d0777fdc20bad8904ae65439338 Mon Sep 17 00:00:00 2001 From: Eric Blake Date: Mon, 17 Dec 2007 21:50:40 -0700 Subject: [PATCH] Revert addition of verify, for BSD/OS. * lib/fseeko.c [!HAVE_FSEEKO]: Allow off_t > long, even though it can't handle large files, for the sake of obsolete platforms. * modules/fseeko (Depends-on): Remove verify. * doc/functions/fseeko.texi (fseeko): Document BSD/OS limitation. * doc/functions/ftello.texi (ftello): Likewise. * doc/functions/fgetpos.texi (fgetpos): Likewise. Reported by Larry Jones. Signed-off-by: Eric Blake --- ChangeLog | 11 +++++++++++ doc/functions/fgetpos.texi | 4 ++++ doc/functions/fseeko.texi | 4 ++++ doc/functions/ftello.texi | 4 ++++ lib/fseeko.c | 3 --- modules/fseeko | 1 - 6 files changed, 23 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index e64c846045..d109b2ec13 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-12-17 Eric Blake + + Revert addition of verify, for BSD/OS. + * lib/fseeko.c [!HAVE_FSEEKO]: Allow off_t > long, even though it + can't handle large files, for the sake of obsolete platforms. + * modules/fseeko (Depends-on): Remove verify. + * doc/functions/fseeko.texi (fseeko): Document BSD/OS limitation. + * doc/functions/ftello.texi (ftello): Likewise. + * doc/functions/fgetpos.texi (fgetpos): Likewise. + Reported by Larry Jones. + 2007-12-17 Petr Salinger getcwd.c: Use a more readable witness: HAVE_OPENAT_SUPPORT diff --git a/doc/functions/fgetpos.texi b/doc/functions/fgetpos.texi index 2caffc0181..6a2c607a6c 100644 --- a/doc/functions/fgetpos.texi +++ b/doc/functions/fgetpos.texi @@ -16,4 +16,8 @@ Portability problems not fixed by Gnulib: @code{fflush}, @code{ftell}, @code{ftello}, @code{fgetpos} behave incorrectly on input streams that are opened in @code{O_TEXT} mode and whose contents contains Unix line terminators (LF), on some platforms: mingw. +@item +On platforms where @code{off_t} is a 64-bit type, but @code{fseeko} is +not present, stream operations on files larger than 2 GB silently do +the wrong thing. This affects BSD/OS, which is mostly obsolete. @end itemize diff --git a/doc/functions/fseeko.texi b/doc/functions/fseeko.texi index 3b6c4e9573..f1a45cb676 100644 --- a/doc/functions/fseeko.texi +++ b/doc/functions/fseeko.texi @@ -24,4 +24,8 @@ Portability problems not fixed by Gnulib: On platforms where @code{off_t} is a 32-bit type, @code{fseeko} does not work correctly with files larger than 2 GB. The fix is to use the @code{AC_SYS_LARGEFILE} macro. +@item +On platforms where @code{off_t} is a 64-bit type, but @code{fseeko} is +not present, stream operations on files larger than 2 GB silently do +the wrong thing. This affects BSD/OS, which is mostly obsolete. @end itemize diff --git a/doc/functions/ftello.texi b/doc/functions/ftello.texi index 3fb995f625..e78300fb6f 100644 --- a/doc/functions/ftello.texi +++ b/doc/functions/ftello.texi @@ -28,4 +28,8 @@ correctly with files larger than 2 GB. The fix is to use the @code{fflush}, @code{ftell}, @code{ftello}, @code{fgetpos} behave incorrectly on input streams that are opened in @code{O_TEXT} mode and whose contents contains Unix line terminators (LF), on some platforms: mingw. +@item +On platforms where @code{off_t} is a 64-bit type, but @code{fseeko} is +not present, stream operations on files larger than 2 GB silently do +the wrong thing. This affects BSD/OS, which is mostly obsolete. @end itemize diff --git a/lib/fseeko.c b/lib/fseeko.c index 6d55ec8b12..97dcf6da05 100644 --- a/lib/fseeko.c +++ b/lib/fseeko.c @@ -27,9 +27,6 @@ #if !HAVE_FSEEKO # undef fseek # define fseeko fseek - -# include -verify (sizeof (off_t) == sizeof (long)); #endif int diff --git a/modules/fseeko b/modules/fseeko index cb26003de8..eb109011ed 100644 --- a/modules/fseeko +++ b/modules/fseeko @@ -8,7 +8,6 @@ m4/fseeko.m4 Depends-on: lseek stdio -verify configure.ac-early: AC_REQUIRE([AC_FUNC_FSEEKO]) -- 2.30.2