aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-11-11 09:02:46 -0200
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-12-14 15:31:24 -0200
commit7fe1e1d60a0f7b5eaf9f423c1fea7d0660690088 (patch)
treede34ea63f0aee77abb4a5e097845b69d6e6f799c /sysdeps
parent2bf6e649d6db0c678b49b5d634022f60e6335b42 (diff)
downloadglibc-7fe1e1d60a0f7b5eaf9f423c1fea7d0660690088.zip
glibc-7fe1e1d60a0f7b5eaf9f423c1fea7d0660690088.tar.gz
glibc-7fe1e1d60a0f7b5eaf9f423c1fea7d0660690088.tar.bz2
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.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/rename.c (renamed from sysdeps/unix/sysv/linux/generic/rename.c)14
1 files changed, 10 insertions, 4 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/rename.c b/sysdeps/unix/sysv/linux/rename.c
index 174c147..73f0ae4 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
}