From 7c65e9001b93d5d20046bc4d50fd10fff5f4adc2 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 20 Jan 2006 07:08:05 +0000
Subject: * include/fcntl.h: Declare __have_atfcts.

	* sysdeps/unix/sysv/linux/faccessat.c: Use syscall if available.
	* sysdeps/unix/sysv/linux/fchmodat.c: Likewise.
	* sysdeps/unix/sysv/linux/fchownat.c: Likewise.
	* sysdeps/unix/sysv/linux/futimesat.c: Likewise.
	* sysdeps/unix/sysv/linux/linkat.c: Likewise.
	* sysdeps/unix/sysv/linux/mkdirat.c: Likewise.
	* sysdeps/unix/sysv/linux/openat.c: Likewise.
	* sysdeps/unix/sysv/linux/readlinkat.c: Likewise.
	* sysdeps/unix/sysv/linux/renameat.c: Likewise.
	* sysdeps/unix/sysv/linux/symlinkat.c: Likewise.
	* sysdeps/unix/sysv/linux/unlinkat.c: Likewise.
	* sysdeps/unix/sysv/linux/xmknodat.c: Likewise.
	* sysdeps/unix/sysv/linux/wordsize-64/fxstatat.c: Likewise.
	* sysdeps/unix/sysv/linux/kernel-features.h: Define __ASSUME_PSELECT,
	__ASSUME_PPOLL, and __ASSUME_ATFCTS if possible.

	* io/ppoll.c: New file.
	* io/Makefile (routines): Add ppoll.
	(CFLAGS-ppoll.c): Define.
	* io/Versions: Export ppoll for GLIBC_2.4.
	* io/sys/poll.h: Declare ppoll.
	* sysdeps/unix/sysv/linux/ppoll.c: New file.

	* misc/pselect.c: Make it possible to include this file to define
	the generic code as a static function.
	* sysdeps/unix/sysv/linux/pselect.c: New file.
---
 sysdeps/unix/sysv/linux/faccessat.c | 62 +++++++++++++++++++++++++------------
 1 file changed, 42 insertions(+), 20 deletions(-)

(limited to 'sysdeps/unix/sysv/linux/faccessat.c')

diff --git a/sysdeps/unix/sysv/linux/faccessat.c b/sysdeps/unix/sysv/linux/faccessat.c
index 80b3b240f7..7c28280ae6 100644
--- a/sysdeps/unix/sysv/linux/faccessat.c
+++ b/sysdeps/unix/sysv/linux/faccessat.c
@@ -25,8 +25,10 @@
 #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;
@@ -40,42 +42,61 @@ faccessat (fd, file, mode, flag)
       return -1;
     }
 
-  char *buf = NULL;
+  int result;
 
-  if (fd != AT_FDCWD && file[0] != '/')
+#ifdef __NR_faccessat
+  if (flag == 0
+# ifndef __ASSUME_ATFCTS
+      && __have_atfcts >= 0
+# endif
+      )
     {
-      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;
+      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.  */
+# ifndef __NR_laccess		/* Linux so far has no laccess syscall.  */
       && !(flag & AT_SYMLINK_NOFOLLOW)
-#endif
+# 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
+# ifdef __NR_laccess
       if (flag & AT_SYMLINK_NOFOLLOW)
 	result = INTERNAL_SYSCALL (laccess, err, 2, file, mode);
       else
-#endif
+# endif
 	result = INTERNAL_SYSCALL (access, err, 2, file, mode);
 
       if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0))
@@ -86,6 +107,7 @@ faccessat (fd, file, mode, flag)
 
       return result;
     }
+#endif
 
   struct stat64 stats;
   if (fstatat64 (fd, file, &stats, flag & AT_SYMLINK_NOFOLLOW))
-- 
cgit 1.4.1