Update copyright dates with scripts/update-copyrights.

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

diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c
index 7c28280ae6c7bbdc42a6a4260b9ca665baed2227..a5891f43c299b107ee50af7e91d72df4c4a1bee2 100644 (file)
--- a/sysdeps/unix/sysv/linux/faccessat.c
+++ b/sysdeps/unix/sysv/linux/faccessat.c
@@ -1,5 +1,5 @@
 /* Test for access to file, relative to open directory.  Linux version.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2019 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
@@ -13,9 +13,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/>.  */
 
 #include <errno.h>
 #include <fcntl.h>
@@ -25,92 +24,20 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <alloca.h>
-#include <kernel-features.h>
 #include <sysdep.h>
 
 
 int
-faccessat (fd, file, mode, flag)
-     int fd;
-     const char *file;
-     int mode;
-     int flag;
+faccessat (int fd, const char *file, int mode, int flag)
 {
   if (flag & ~(AT_SYMLINK_NOFOLLOW | AT_EACCESS))
-    {
-      __set_errno (EINVAL);
-      return -1;
-    }
+    return INLINE_SYSCALL_ERROR_RETURN_VALUE (EINVAL);
 
-  int result;
-
-#ifdef __NR_faccessat
-  if (flag == 0
-# ifndef __ASSUME_ATFCTS
-      && __have_atfcts >= 0
-# endif
-      )
-    {
-      result = INLINE_SYSCALL (faccessat, 3, fd, file, mode);
-# ifndef __ASSUME_ATFCTS
-      if (result == -1 && errno == ENOSYS)
-       __have_atfcts = -1;
-      else
-# endif
-       return result;
-    }
-#endif
-
-#ifndef __ASSUME_ATFCTS
-  if ((!(flag & AT_EACCESS) || ! __libc_enable_secure)
-# ifndef __NR_laccess          /* Linux so far has no laccess syscall.  */
-      && !(flag & AT_SYMLINK_NOFOLLOW)
-# endif
-      )
-    {
-      /* If we are not set-uid or set-gid, access does the same.  */
-      char *buf = NULL;
-
-      if (fd != AT_FDCWD && file[0] != '/')
-       {
-         size_t filelen = strlen (file);
-         static const char procfd[] = "/proc/self/fd/%d/%s";
-         /* Buffer for the path name we are going to use.  It consists of
-            - the string /proc/self/fd/
-            - the file descriptor number
-            - the file name provided.
-            The final NUL is included in the sizeof.   A bit of overhead
-            due to the format elements compensates for possible negative
-            numbers.  */
-         size_t buflen = sizeof (procfd) + sizeof (int) * 3 + filelen;
-         buf = alloca (buflen);
-
-         __snprintf (buf, buflen, procfd, fd, file);
-         file = buf;
-       }
-
-      int result;
-      INTERNAL_SYSCALL_DECL (err);
-
-# ifdef __NR_laccess
-      if (flag & AT_SYMLINK_NOFOLLOW)
-       result = INTERNAL_SYSCALL (laccess, err, 2, file, mode);
-      else
-# endif
-       result = INTERNAL_SYSCALL (access, err, 2, file, mode);
-
-      if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0))
-       {
-         __atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf);
-         result = -1;
-       }
-
-      return result;
-    }
-#endif
+  if ((flag == 0 || ((flag & ~AT_EACCESS) == 0 && ! __libc_enable_secure)))
+    return INLINE_SYSCALL (faccessat, 3, fd, file, mode);
 
   struct stat64 stats;
-  if (fstatat64 (fd, file, &stats, flag & AT_SYMLINK_NOFOLLOW))
+  if (__fxstatat64 (_STAT_VER, fd, file, &stats, flag & AT_SYMLINK_NOFOLLOW))
     return -1;
 
   mode &= (X_OK | W_OK | R_OK);        /* Clear any bogus bits. */
@@ -140,6 +67,5 @@ faccessat (fd, file, mode, flag)
   if (granted == mode)
     return 0;
 
-  __set_errno (EACCES);
-  return -1;
+  return INLINE_SYSCALL_ERROR_RETURN_VALUE (EACCES);
 }