Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / libio / ftello.c

diff --git a/libio/ftello.c b/libio/ftello.c
index 6c1f1a670fd5406442ac7122e639b8ec95204533..7122815f2e297ac1f97e9f3c4d88511ce94056cd 100644 (file)
--- a/libio/ftello.c
+++ b/libio/ftello.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1993, 1995-2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1993-2016 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
@@ -12,9 +12,8 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.
 
    As a special exception, if you link the code in this file with
    files compiled with a GNU compiler to produce an executable,
@@ -32,28 +31,38 @@
 
 
 off_t
-ftello (fp)
-     _IO_FILE *fp;
+__ftello (_IO_FILE *fp)
 {
-  _IO_off_t pos;
+  _IO_off64_t pos;
   CHECK_FILE (fp, -1L);
-  _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, fp);
-  _IO_flockfile (fp);
-  pos = _IO_seekoff (fp, 0, _IO_seek_cur, 0);
-  if (_IO_in_backup (fp))
+  _IO_acquire_lock (fp);
+  pos = _IO_seekoff_unlocked (fp, 0, _IO_seek_cur, 0);
+  if (_IO_in_backup (fp) && pos != _IO_pos_BAD)
     {
       if (fp->_mode <= 0)
        pos -= fp->_IO_save_end - fp->_IO_save_base;
     }
-  _IO_funlockfile (fp);
-  _IO_cleanup_region_end (0);
+  _IO_release_lock (fp);
   if (pos == _IO_pos_BAD)
     {
 #ifdef EIO
       if (errno == 0)
        __set_errno (EIO);
+#endif
+      return -1L;
+    }
+  if ((_IO_off64_t) (off_t) pos != pos)
+    {
+#ifdef EOVERFLOW
+      __set_errno (EOVERFLOW);
 #endif
       return -1L;
     }
   return pos;
 }
+libc_hidden_def (__ftello)
+weak_alias (__ftello, ftello)
+
+#ifdef __OFF_T_MATCHES_OFF64_T
+weak_alias (__ftello, ftello64)
+#endif