[1/2] Consolidate rename Linux implementation
Commit Message
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.
---
ChangeLog | 5 +++++
sysdeps/unix/sysv/linux/generic/rename.c | 29 --------------------------
sysdeps/unix/sysv/linux/rename.c | 35 ++++++++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 29 deletions(-)
delete mode 100644 sysdeps/unix/sysv/linux/generic/rename.c
create mode 100644 sysdeps/unix/sysv/linux/rename.c
Comments
On Dez 14 2016, Adhemerval Zanella <adhemerval.zanella@linaro.org> wrote:
> * sysdeps/unix/sysv/linux/rename.c: New file.
> * sysdeps/unix/sysv/linux/generic/rename.c: Remove file.
Ok.
> +/* Rename the file OLD to NEW. */
> +int
> +rename (const char *old, const char *new)
> +{
> +#if defined(__NR_rename)
Space before paren.
Andreas.
On 12/14/2016 9:12 AM, Adhemerval Zanella wrote:
> 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.
This one and the renameat version both look good to me (modulo Andreas's
observation about whitespace).
deleted file mode 100644
@@ -1,29 +0,0 @@
-/* Copyright (C) 2011-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
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library. If not, see
- <http://www.gnu.org/licenses/>. */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <sysdep.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);
-}
new file mode 100644
@@ -0,0 +1,35 @@
+/* Linux implementation for rename function.
+ Copyright (C) 2016 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
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library. If not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sysdep.h>
+#include <errno.h>
+
+/* Rename the file OLD to NEW. */
+int
+rename (const char *old, const char *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
+}