diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2006-01-20 07:08:05 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2006-01-20 07:08:05 +0000 |
| commit | 7c65e9001b93d5d20046bc4d50fd10fff5f4adc2 (patch) | |
| tree | 38f65e2a20910e6d074fbcec137eb66853e70eaa /sysdeps/unix/sysv/linux/renameat.c | |
| parent | 93c04024a6b900b69bbe9a70de06ac23b8273787 (diff) | |
| download | glibc-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/renameat.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/renameat.c | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/renameat.c b/sysdeps/unix/sysv/linux/renameat.c index 849c67b5d6..bc8ced42df 100644 --- a/sysdeps/unix/sysv/linux/renameat.c +++ b/sysdeps/unix/sysv/linux/renameat.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Copyright (C) 2005, 2006 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 @@ -20,9 +20,11 @@ #include <fcntl.h> #include <stdio.h> #include <string.h> +#include <kernel-features.h> #include <sysdep.h> +#ifndef __ASSUME_ATFCTS void attribute_hidden __atfct_seterrno_2 (int errval, int fd1, const char *buf1, int fd2, @@ -67,6 +69,7 @@ __atfct_seterrno_2 (int errval, int fd1, const char *buf1, int fd2, out: __set_errno (errval); } +#endif /* Rename the file OLD relative to OLDFD to NEW relative to NEWFD. */ @@ -77,6 +80,24 @@ renameat (oldfd, old, newfd, new) int newfd; const char *new; { + int result; + +#ifdef __NR_renameat +# ifndef __ASSUME_ATFCTS + if (__have_atfcts >= 0) +# endif + { + result = INLINE_SYSCALL (renameat, 4, oldfd, old, newfd, new); +# ifndef __ASSUME_ATFCTS + if (result == -1 && errno == ENOSYS) + __have_atfcts = -1; + else +# endif + return result; + } +#endif + +#ifndef __ASSUME_ATFCTS static const char procfd[] = "/proc/self/fd/%d/%s"; char *bufold = NULL; @@ -118,7 +139,7 @@ renameat (oldfd, old, newfd, new) INTERNAL_SYSCALL_DECL (err); - int result = INTERNAL_SYSCALL (rename, err, 2, old, new); + result = INTERNAL_SYSCALL (rename, err, 2, old, new); if (__builtin_expect (INTERNAL_SYSCALL_ERROR_P (result, err), 0)) { @@ -128,4 +149,5 @@ renameat (oldfd, old, newfd, new) } return result; +#endif } |