[git commit] unlink: Use unlinkat if arch does not have the unlink 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=09a387a0fcedce4270f62f5ea75c7bb0374c4d7f
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/unistd.h | 1 +
libc/sysdeps/linux/common/unlink.c | 8 ++++++++
libc/sysdeps/linux/common/unlinkat.c | 1 +
3 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/include/unistd.h b/include/unistd.h
index 90d3459..ed77ce9 100644
--- a/include/unistd.h
+++ b/include/unistd.h
@@ -923,6 +923,7 @@ libc_hidden_proto(unlink)
/* Remove the link NAME relative to FD. */
extern int unlinkat (int __fd, const char *__name, int __flag)
__THROW __nonnull ((2));
+libc_hidden_proto(unlinkat)
#endif
/* Remove the directory PATH. */
diff --git a/libc/sysdeps/linux/common/unlink.c b/libc/sysdeps/linux/common/unlink.c
index d4504d4..317bc5d 100644
--- a/libc/sysdeps/linux/common/unlink.c
+++ b/libc/sysdeps/linux/common/unlink.c
@@ -10,5 +10,13 @@
#include <sys/syscall.h>
#include <unistd.h>
+#if defined __NR_unlinkat && !defined __NR_unlink
+# include <fcntl.h>
+int unlink(const char *pathname)
+{
+ return unlinkat(AT_FDCWD, pathname, 0);
+}
+#else
_syscall1(int, unlink, const char *, pathname)
+#endif
libc_hidden_def(unlink)
diff --git a/libc/sysdeps/linux/common/unlinkat.c b/libc/sysdeps/linux/common/unlinkat.c
index 0eaf2b6..432af1b 100644
--- a/libc/sysdeps/linux/common/unlinkat.c
+++ b/libc/sysdeps/linux/common/unlinkat.c
@@ -11,6 +11,7 @@
#ifdef __NR_unlinkat
_syscall3(int, unlinkat, int, fd, const char *, file, int, flag)
+libc_hidden_def(unlinkat)
#else
/* should add emulation with unlink() and /proc/self/fd/ ... */
#endif
More information about the uClibc-cvs
mailing list