[git commit] open: Use openat if arch does not have the open syscall

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


commit: http://git.uclibc.org/uClibc/commit/?id=9f44c4ca56c2a318fb51029340a26764ed2b708f
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>
---
 libc/sysdeps/linux/common/open.c |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/libc/sysdeps/linux/common/open.c b/libc/sysdeps/linux/common/open.c
index a72e84d..aab0fb5 100644
--- a/libc/sysdeps/linux/common/open.c
+++ b/libc/sysdeps/linux/common/open.c
@@ -12,13 +12,18 @@
 #include <stdarg.h>
 #include <cancel.h>
 
-#define __NR___syscall_open __NR_open
+#if defined __NR_open
+# define __NR___syscall_open __NR_open
 static __always_inline _syscall3(int, __syscall_open, const char *, file,
 				 int, flags, __kernel_mode_t, mode)
 strong_alias_untyped(__syscall_open,__NC(open))
 
-#define __NR___open2_nocancel __NR_open
+# define __NR___open2_nocancel __NR_open
 _syscall2(int, __NC(open2), const char *, file, int, flags)
+#else
+int __open2_nocancel(const char *, int) __nonnull ((1)) attribute_hidden;
+int __open_nocancel(const char *, int, mode_t) __nonnull ((1)) attribute_hidden;
+#endif
 
 int open(const char *file, int oflag, ...)
 {
@@ -32,13 +37,26 @@ int open(const char *file, int oflag, ...)
 	}
 
 	if (SINGLE_THREAD_P)
+#if defined(__NR_open)
 		return __NC(open)(file, oflag, mode);
+#elif defined(__NR_openat)
+		return openat(AT_FDCWD, file, oflag, mode);
+#endif
+
 #ifdef __NEW_THREADS
 	int oldtype = LIBC_CANCEL_ASYNC ();
+# if defined(__NR_open)
 	int result = __NC(open)(file, oflag, mode);
+# else
+	int result = openat(AT_FDCWD, file, oflag, mode);
+# endif
 	LIBC_CANCEL_RESET (oldtype);
 	return result;
 #endif
 }
 lt_strong_alias(open)
 lt_libc_hidden(open)
+#if !defined(__NR_open)
+strong_alias_untyped(open,__open2_nocancel)
+strong_alias_untyped(open,__open_nocancel)
+#endif


More information about the uClibc-cvs mailing list