hurd: Fix build

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

diff --git a/libio/ioseekoff.c b/libio/ioseekoff.c
index 13086ee9127638d8ce52c993171b5f027fadd312..a6370c19ffd39a52c72ae92baf8dd0bccc16681d 100644 (file)
--- a/libio/ioseekoff.c
+++ b/libio/ioseekoff.c
@@ -1,54 +1,72 @@
-/* Copyright (C) 1993, 1997 Free Software Foundation, Inc.
-   This file is part of the GNU IO Library.
+/* Copyright (C) 1993-2019 Free Software Foundation, Inc.
+   This file is part of the GNU C Library.
 
-   This library 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 GNU C Library is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 2.1 of the License, or (at your option) any later version.
 
-   This library is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
+   The GNU C Library 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.
+   Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
-   along with this library; see the file COPYING.  If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
-   MA 02111-1307, USA.
+   You should have received a copy of the GNU Lesser General Public
+   License along with the GNU C Library; if not, see
+   <http://www.gnu.org/licenses/>.
 
-   As a special exception, if you link this library with files
-   compiled with a GNU compiler to produce an executable, this does
-   not cause the resulting executable to be covered by the GNU General
-   Public License.  This exception does not however invalidate any
-   other reasons why the executable file might be covered by the GNU
-   General Public License.  */
+   As a special exception, if you link the code in this file with
+   files compiled with a GNU compiler to produce an executable,
+   that does not cause the resulting executable to be covered by
+   the GNU Lesser General Public License.  This exception does not
+   however invalidate any other reasons why the executable file
+   might be covered by the GNU Lesser General Public License.
+   This exception applies to code released by its copyright holders
+   in files containing the exception.  */
 
+#include <stdlib.h>
 #include <libioP.h>
+#include <errno.h>
 
-_IO_fpos64_t
-_IO_seekoff (fp, offset, dir, mode)
-     _IO_FILE *fp;
-     _IO_off64_t offset;
-     int dir;
-     int mode;
+off64_t
+_IO_seekoff_unlocked (FILE *fp, off64_t offset, int dir, int mode)
 {
-  _IO_fpos64_t retval;
+  if (dir != _IO_seek_cur && dir != _IO_seek_set && dir != _IO_seek_end)
+    {
+      __set_errno (EINVAL);
+      return EOF;
+    }
 
   /* If we have a backup buffer, get rid of it, since the __seekoff
      callback may not know to do the right thing about it.
      This may be over-kill, but it'll do for now. TODO */
-  _IO_cleanup_region_start ((void (*) __P ((void *))) _IO_funlockfile, fp);
-  _IO_flockfile (fp);
-
-
-  if (_IO_have_backup (fp))
+  if (mode != 0 && ((_IO_fwide (fp, 0) < 0 && _IO_have_backup (fp))
+                   || (_IO_fwide (fp, 0) > 0 && _IO_have_wbackup (fp))))
     {
       if (dir == _IO_seek_cur && _IO_in_backup (fp))
-       offset -= fp->_IO_read_end - fp->_IO_read_ptr;
-      _IO_free_backup_area (fp);
+       {
+         if (_IO_vtable_offset (fp) != 0 || fp->_mode <= 0)
+           offset -= fp->_IO_read_end - fp->_IO_read_ptr;
+         else
+           abort ();
+       }
+      if (_IO_fwide (fp, 0) < 0)
+       _IO_free_backup_area (fp);
+      else
+       _IO_free_wbackup_area (fp);
     }
-  retval = _IO_SEEKOFF (fp, offset, dir, mode);
 
-  _IO_cleanup_region_end (1);
+  return _IO_SEEKOFF (fp, offset, dir, mode);
+}
+
+
+off64_t
+_IO_seekoff (FILE *fp, off64_t offset, int dir, int mode)
+{
+  off64_t retval;
+
+  _IO_acquire_lock (fp);
+  retval = _IO_seekoff_unlocked (fp, offset, dir, mode);
+  _IO_release_lock (fp);
   return retval;
 }