From: Eric Blake <ebb9@byu.net>
Date: Tue, 18 Dec 2007 04:50:40 +0000 (-0700)
Subject: Revert addition of verify, for BSD/OS.
X-Git-Tag: v0.1~7917
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=b41a41b698a82d0777fdc20bad8904ae65439338;p=gnulib.git

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 <ebb9@byu.net>
---

diff --git a/ChangeLog b/ChangeLog
index e64c84604..d109b2ec1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-17  Eric Blake  <ebb9@byu.net>
+
+	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  <Petr.Salinger@seznam.cz>
 
 	getcwd.c: Use a more readable witness: HAVE_OPENAT_SUPPORT
diff --git a/doc/functions/fgetpos.texi b/doc/functions/fgetpos.texi
index 2caffc018..6a2c607a6 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 3b6c4e957..f1a45cb67 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 3fb995f62..e78300fb6 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 6d55ec8b1..97dcf6da0 100644
--- a/lib/fseeko.c
+++ b/lib/fseeko.c
@@ -27,9 +27,6 @@
 #if !HAVE_FSEEKO
 # undef fseek
 # define fseeko fseek
-
-# include <verify.h>
-verify (sizeof (off_t) == sizeof (long));
 #endif
 
 int
diff --git a/modules/fseeko b/modules/fseeko
index cb26003de..eb109011e 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])