[PATCH v2 04/46] chmod: Use fchmodat if arch does not have the chmod syscall

Markos Chandras markos.chandras at gmail.com
Mon Nov 26 14:23:46 UTC 2012


From: Markos Chandras <markos.chandras at imgtec.com>

Signed-off-by: Markos Chandras <markos.chandras at imgtec.com>
---
 include/sys/stat.h                   | 1 +
 libc/sysdeps/linux/common/chmod.c    | 9 +++++++++
 libc/sysdeps/linux/common/fchmodat.c | 1 +
 3 files changed, 11 insertions(+)

diff --git a/include/sys/stat.h b/include/sys/stat.h
index 170a4e6..88b7044 100644
--- a/include/sys/stat.h
+++ b/include/sys/stat.h
@@ -310,6 +310,7 @@ extern int fchmod (int __fd, __mode_t __mode) __THROW;
 extern int fchmodat (int __fd, __const char *__file, __mode_t __mode,
 		     int __flag)
      __THROW __nonnull ((2)) __wur;
+libc_hidden_proto(fchmodat)
 #endif /* Use ATFILE.  */
 
 
diff --git a/libc/sysdeps/linux/common/chmod.c b/libc/sysdeps/linux/common/chmod.c
index 871e023..c03bb2a 100644
--- a/libc/sysdeps/linux/common/chmod.c
+++ b/libc/sysdeps/linux/common/chmod.c
@@ -9,8 +9,16 @@
 
 #include <sys/syscall.h>
 #include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 
+#if defined(__NR_fchmodat) && !defined(__NR_chmod)
+int chmod(const char *path, mode_t mode)
+{
+	return fchmodat(AT_FDCWD, path, mode, 0);
+}
 
+#else
 #define __NR___syscall_chmod __NR_chmod
 static __inline__ _syscall2(int, __syscall_chmod, const char *, path, __kernel_mode_t, mode)
 
@@ -18,4 +26,5 @@ int chmod(const char *path, mode_t mode)
 {
 	return __syscall_chmod(path, mode);
 }
+#endif
 libc_hidden_def(chmod)
diff --git a/libc/sysdeps/linux/common/fchmodat.c b/libc/sysdeps/linux/common/fchmodat.c
index 8224a52..1e936e0 100644
--- a/libc/sysdeps/linux/common/fchmodat.c
+++ b/libc/sysdeps/linux/common/fchmodat.c
@@ -32,6 +32,7 @@ int fchmodat(int fd, const char *file, mode_t mode, int flag)
 
 	return INLINE_SYSCALL(fchmodat, 3, fd, file, mode);
 }
+libc_hidden_def(fchmodat)
 #else
 /* should add emulation with fchmod() and /proc/self/fd/ ... */
 #endif
-- 
1.8.0




More information about the uClibc mailing list