summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/futimesat.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-01-20 07:08:05 +0000
committerUlrich Drepper <drepper@redhat.com>2006-01-20 07:08:05 +0000
commit7c65e9001b93d5d20046bc4d50fd10fff5f4adc2 (patch)
tree38f65e2a20910e6d074fbcec137eb66853e70eaa /sysdeps/unix/sysv/linux/futimesat.c
parent93c04024a6b900b69bbe9a70de06ac23b8273787 (diff)
downloadglibc-7c65e9001b93d5d20046bc4d50fd10fff5f4adc2.tar.gz
glibc-7c65e9001b93d5d20046bc4d50fd10fff5f4adc2.tar.xz
glibc-7c65e9001b93d5d20046bc4d50fd10fff5f4adc2.zip
* 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.
Diffstat (limited to 'sysdeps/unix/sysv/linux/futimesat.c')
-rw-r--r--sysdeps/unix/sysv/linux/futimesat.c30
1 files changed, 24 insertions, 6 deletions
diff --git a/sysdeps/unix/sysv/linux/futimesat.c b/sysdeps/unix/sysv/linux/futimesat.c
index be148b8d7a..514f456927 100644
--- a/sysdeps/unix/sysv/linux/futimesat.c
+++ b/sysdeps/unix/sysv/linux/futimesat.c
@@ -35,6 +35,24 @@ futimesat (fd, file, tvp)
      const char *file;
      const struct timeval tvp[2];
 {
+  int result;
+
+#ifdef __NR_futimesat
+# ifndef __ASSUME_ATFCTS
+  if (__have_atfcts >= 0)
+# endif
+    {
+      result = INLINE_SYSCALL (futimesat, 3, fd, file, tvp);
+# ifndef __ASSUME_ATFCTS
+      if (result == -1 && errno == ENOSYS)
+	__have_atfcts = -1;
+      else
+# endif
+	return result;
+    }
+#endif
+
+#ifndef __ASSUME_ATFCTS
   char *buf = NULL;
 
   if (file == NULL)
@@ -70,24 +88,23 @@ futimesat (fd, file, tvp)
       file = buf;
     }
 
-  int result;
   INTERNAL_SYSCALL_DECL (err);
 
-#ifdef __NR_utimes
+# ifdef __NR_utimes
   result = INTERNAL_SYSCALL (utimes, err, 2, file, tvp);
   if (__builtin_expect (!INTERNAL_SYSCALL_ERROR_P (result, err), 1))
     return result;
 
-# ifndef __ASSUME_UTIMES
+#  ifndef __ASSUME_UTIMES
   if (INTERNAL_SYSCALL_ERRNO (result, err) != ENOSYS)
     goto fail;
+#  endif
 # endif
-#endif
 
   /* The utimes() syscall does not exist or is not available in the
      used kernel.  Use utime().  For this we have to convert to the
      data format utime() expects.  */
-#ifndef __ASSUME_UTIMES
+# ifndef __ASSUME_UTIMES
   struct utimbuf tmp;
   struct utimbuf *times;
 
@@ -105,9 +122,10 @@ futimesat (fd, file, tvp)
     return result;
 
  fail:
-#endif
+# endif
 
   __atfct_seterrno (INTERNAL_SYSCALL_ERRNO (result, err), fd, buf);
 
   return -1;
+#endif
 }