X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fftello.c;h=f2524084c35fb6f5c50ca146d62006f9814007b0;hb=35dda7458879acb367f2cba0aaf7856cd98f5b63;hp=7054dd5b2a1dcfa4692d137cbd6a1ffc926a4324;hpb=cec93e99d19f54c8f310b8290bab9014891530e3;p=gnulib.git

diff --git a/lib/ftello.c b/lib/ftello.c
index 7054dd5b2..f2524084c 100644
--- a/lib/ftello.c
+++ b/lib/ftello.c
@@ -1,33 +1,42 @@
 /* An ftello() function that works around platform bugs.
    Copyright (C) 2007 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
 
-   You should have received a copy of the GNU General Public License along
-   with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
 
 /* Specification.  */
 #include <stdio.h>
 
+/* Get lseek.  */
+#include <unistd.h>
+
 #undef ftello
 #if !HAVE_FTELLO
+# undef ftell
 # define ftello ftell
 #endif
 
 off_t
 rpl_ftello (FILE *fp)
 {
+#if LSEEK_PIPE_BROKEN
+  /* mingw gives bogus answers rather than failure on non-seekable files.  */
+  if (lseek (fileno (fp), 0, SEEK_CUR) == -1)
+    return -1;
+#endif
+
 #if defined __SL64 && defined __SCLE /* Cygwin */
   if ((fp->_flags & __SL64) == 0)
     {