[git commit] rename: Use renameat if arch does not have the rename syscall

Bernhard Reutner-Fischer rep.dot.nop at gmail.com
Wed Feb 20 12:45:11 UTC 2013


commit: http://git.uclibc.org/uClibc/commit/?id=3a5be53a84ac68255fbcecb73b8fe58a35550c26
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/master

Signed-off-by: Markos Chandras <markos.chandras at imgtec.com>

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 include/stdio.h                      |    1 +
 libc/sysdeps/linux/common/rename.c   |    9 +++++++++
 libc/sysdeps/linux/common/renameat.c |    1 +
 3 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/include/stdio.h b/include/stdio.h
index 381ca5f..e0006d2 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -151,6 +151,7 @@ __END_NAMESPACE_STD
 /* Rename file OLD relative to OLDFD to NEW relative to NEWFD.  */
 extern int renameat (int __oldfd, const char *__old, int __newfd,
 		     const char *__new) __THROW;
+libc_hidden_proto(renameat)
 #endif
 
 __BEGIN_NAMESPACE_STD
diff --git a/libc/sysdeps/linux/common/rename.c b/libc/sysdeps/linux/common/rename.c
index 6183cf4..3ce5a5e 100644
--- a/libc/sysdeps/linux/common/rename.c
+++ b/libc/sysdeps/linux/common/rename.c
@@ -9,5 +9,14 @@
 
 #include <sys/syscall.h>
 #include <stdio.h>
+#include <unistd.h>
 
+#if defined __NR_renameat && !defined __NR_rename
+# include <fcntl.h>
+int rename(const char *oldpath, const char *newpath)
+{
+	return renameat(AT_FDCWD, oldpath, AT_FDCWD, newpath);
+}
+#else
 _syscall2(int, rename, const char *, oldpath, const char *, newpath)
+#endif
diff --git a/libc/sysdeps/linux/common/renameat.c b/libc/sysdeps/linux/common/renameat.c
index a898f7b..b0b91fa 100644
--- a/libc/sysdeps/linux/common/renameat.c
+++ b/libc/sysdeps/linux/common/renameat.c
@@ -11,6 +11,7 @@
 
 #ifdef __NR_renameat
 _syscall4(int, renameat, int, oldfd, const char *, old, int, newfd, const char *, new)
+libc_hidden_def(renameat)
 #else
 /* should add emulation with rename() and /proc/self/fd/ ... */
 #endif


More information about the uClibc-cvs mailing list