X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fftell.c;h=74ec986e27b1cede87d41db35db54591b3c0135b;hb=cea318a913148d825c03a4e45f4553e4cb4e2880;hp=796e687b600c64f6ee79f9d7f533ea889c4332d3;hpb=cf0e9950204657e10ec322126130fb35b1d99925;p=gnulib.git

diff --git a/lib/ftell.c b/lib/ftell.c
index 796e687b6..74ec986e2 100644
--- a/lib/ftell.c
+++ b/lib/ftell.c
@@ -1,19 +1,18 @@
 /* An ftell() function that works around platform bugs.
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2011 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>
 
@@ -21,16 +20,15 @@
 #include <stdio.h>
 
 #include <errno.h>
-/* Get off_t.  */
-#include <unistd.h>
+#include <limits.h>
 
 long
 ftell (FILE *fp)
 {
   /* Use the replacement ftello function with all its workarounds.  */
   off_t offset = ftello (fp);
-  if (offset == (long)offset)
-    return (long)offset;
+  if (LONG_MIN <= offset && offset <= LONG_MAX)
+    return /* (long) */ offset;
   else
     {
       errno = EOVERFLOW;