Update copyright dates with scripts/update-copyrights.

[thirdparty/glibc.git] / sysdeps / unix / sysv / linux / i386 / fxstat.c

diff --git a/sysdeps/unix/sysv/linux/i386/fxstat.c b/sysdeps/unix/sysv/linux/i386/fxstat.c
index 5077780f0c93b4b9d66fc794c67ef1b56ffef4ad..8eda42f2e6bd3a68d75e82985eda77ccebf48a2f 100644 (file)
--- a/sysdeps/unix/sysv/linux/i386/fxstat.c
+++ b/sysdeps/unix/sysv/linux/i386/fxstat.c
@@ -1,6 +1,5 @@
 /* fxstat using old-style Unix fstat system call.
-   Copyright (C) 1991,1995-1998,2000,2002,2003,2006
-       Free Software Foundation, Inc.
+   Copyright (C) 1991-2020 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
@@ -15,7 +14,7 @@
 
    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/>.  */
+   <https://www.gnu.org/licenses/>.  */
 
 /* Ho hum, if xstat == xstat64 we must get rid of the prototype or gcc
    will complain since they don't strictly match.  */
@@ -28,72 +27,34 @@
 
 #include <sysdep.h>
 #include <sys/syscall.h>
-#include <bp-checks.h>
-
-#include <kernel-features.h>
 
 #include <xstatconv.h>
 
-#ifdef __NR_stat64
-# if  __ASSUME_STAT64_SYSCALL == 0
-/* The variable is shared between all wrappers around *stat64 calls.  */
-extern int __have_no_stat64;
-# endif
-#endif
-
 /* Get information about the file FD in BUF.  */
 int
 __fxstat (int vers, int fd, struct stat *buf)
 {
-#if __ASSUME_STAT64_SYSCALL == 0
-  struct kernel_stat kbuf;
-#endif
   int result;
 
   if (vers == _STAT_VER_KERNEL)
-    return INLINE_SYSCALL (fstat, 2, fd, CHECK_1 ((struct kernel_stat *) buf));
+    return INLINE_SYSCALL (fstat, 2, fd, buf);
 
-#if __ASSUME_STAT64_SYSCALL > 0
   {
     struct stat64 buf64;
 
-    result = INLINE_SYSCALL (fstat64, 2, fd, __ptrvalue (&buf64));
-    if (result == 0)
-      result = __xstat32_conv (vers, &buf64, buf);
-    return result;
+    INTERNAL_SYSCALL_DECL (err);
+    result = INTERNAL_SYSCALL (fstat64, err, 2, fd, &buf64);
+    if (__glibc_unlikely (INTERNAL_SYSCALL_ERROR_P (result, err)))
+      return INLINE_SYSCALL_ERROR_RETURN_VALUE (INTERNAL_SYSCALL_ERRNO (result,
+                                                                       err));
+    else
+      return __xstat32_conv (vers, &buf64, buf);
   }
-#else
-
-# if defined __NR_stat64
-  /* To support 32 bit UIDs, we have to use stat64.  The normal stat call only returns
-     16 bit UIDs.  */
-  if (! __have_no_stat64)
-    {
-      struct stat64 buf64;
-
-      result = INLINE_SYSCALL (fstat64, 2, fd, __ptrvalue (&buf64));
-
-      if (result == 0)
-       result = __xstat32_conv (vers, &buf64, buf);
-
-      if (result != -1 || errno != ENOSYS)
-       return result;
-
-      __have_no_stat64 = 1;
-    }
-# endif
-
-  result = INLINE_SYSCALL (fstat, 2, fd, __ptrvalue (&kbuf));
-  if (result == 0)
-    result = __xstat_conv (vers, &kbuf, buf);
-
-  return result;
-#endif  /* __ASSUME_STAT64_SYSCALL  */
 }
 
 hidden_def (__fxstat)
 weak_alias (__fxstat, _fxstat);
-#ifdef XSTAT_IS_XSTAT64
+#if XSTAT_IS_XSTAT64
 #undef __fxstat64
 strong_alias (__fxstat, __fxstat64);
 hidden_ver (__fxstat, __fxstat64)