diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-11-11 09:02:46 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-12-14 15:31:24 -0200 |
| commit | 7fe1e1d60a0f7b5eaf9f423c1fea7d0660690088 (patch) | |
| tree | de34ea63f0aee77abb4a5e097845b69d6e6f799c | |
| parent | 2bf6e649d6db0c678b49b5d634022f60e6335b42 (diff) | |
| download | glibc-7fe1e1d60a0f7b5eaf9f423c1fea7d0660690088.tar.gz glibc-7fe1e1d60a0f7b5eaf9f423c1fea7d0660690088.tar.xz glibc-7fe1e1d60a0f7b5eaf9f423c1fea7d0660690088.zip | |
Consolidate rename Linux implementation
This patch consolidates the Linux rename implementation on sysdeps/unix/sysv/linux/rename.c. Current code try to use __NR_rename if is defined and apply the same strategy for __NR_renameat and __NR_renameat2. Check on x86_64 and aarch64. * sysdeps/unix/sysv/linux/rename.c: New file. * sysdeps/unix/sysv/linux/generic/rename.c: Remove file.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/rename.c (renamed from sysdeps/unix/sysv/linux/generic/rename.c) | 14 |
2 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 90dad72833..a9e69a3364 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2016-12-14 Adhemerval Zanella <adhemerval.zanella@linaro.org> + + * sysdeps/unix/sysv/linux/rename.c: New file. + * sysdeps/unix/sysv/linux/generic/rename.c: Remove file. + 2015-12-14 Wilco Dijkstra <wdijkstr@arm.com> * benchtests/bench-strtok.c (oldstrtok): Add old implementation. diff --git a/sysdeps/unix/sysv/linux/generic/rename.c b/sysdeps/unix/sysv/linux/rename.c index 174c147eb4..73f0ae43bd 100644 --- a/sysdeps/unix/sysv/linux/generic/rename.c +++ b/sysdeps/unix/sysv/linux/rename.c @@ -1,6 +1,6 @@ -/* Copyright (C) 2011-2016 Free Software Foundation, Inc. +/* Linux implementation for rename function. + Copyright (C) 2016 Free Software Foundation, Inc. This file is part of the GNU C Library. - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011. The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public @@ -17,13 +17,19 @@ <http://www.gnu.org/licenses/>. */ #include <stdio.h> -#include <unistd.h> #include <fcntl.h> #include <sysdep.h> +#include <errno.h> /* Rename the file OLD to NEW. */ int rename (const char *old, const char *new) { - return INLINE_SYSCALL (renameat, 4, AT_FDCWD, old, AT_FDCWD, new); +#if defined (__NR_rename) + return INLINE_SYSCALL_CALL (rename, old, new); +#elif defined (__NR_renameat) + return INLINE_SYSCALL_CALL (renameat, AT_FDCWD, old, AT_FDCWD, new); +#else + return INLINE_SYSCALL_CALL (renameat2, AT_FDCWD, old, AT_FDCWD, new, 0); +#endif } |