Browse Source

stat: Use fstatat64 if arch does not have the stat syscall

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

Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Markos Chandras 11 years ago
parent
commit
13f56c443b
3 changed files with 19 additions and 5 deletions
  1. 1 0
      include/sys/stat.h
  2. 1 0
      libc/sysdeps/linux/common/fstatat.c
  3. 17 5
      libc/sysdeps/linux/common/stat.c

+ 1 - 0
include/sys/stat.h

@@ -241,6 +241,7 @@ libc_hidden_proto(fstat64)
 extern int fstatat (int __fd, const char *__restrict __file,
 		    struct stat *__restrict __buf, int __flag)
      __THROW __nonnull ((2, 3));
+libc_hidden_proto(fstatat)
 # else
 #  ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (fstatat, (int __fd, const char *__restrict __file,

+ 1 - 0
libc/sysdeps/linux/common/fstatat.c

@@ -38,6 +38,7 @@ int fstatat(int fd, const char *file, struct stat *buf, int flag)
 # endif /* __ARCH_HAS_DEPRECATED_SYSCALLS__ */
 	return ret;
 }
+libc_hidden_def(fstatat)
 #else
 /* should add emulation with fstat() and /proc/self/fd/ ... */
 #endif

+ 17 - 5
libc/sysdeps/linux/common/stat.c

@@ -10,14 +10,24 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include "xstatconv.h"
 
 #undef stat
 
+#if defined __NR_fstatat64 && !defined __NR_stat
+# include <fcntl.h>
+
+int stat(const char *file_name, struct stat *buf)
+{
+	return fstatat(AT_FDCWD, file_name, buf, 0);
+}
+
+#else
+# include "xstatconv.h"
+
 int stat(const char *file_name, struct stat *buf)
 {
 	int result;
-#ifdef __NR_stat64
+# ifdef __NR_stat64
 	/* normal stat call has limited values for various stat elements
 	 * e.g. uid device major/minor etc.
 	 * so we use 64 variant if available
@@ -28,19 +38,21 @@ int stat(const char *file_name, struct stat *buf)
 	if (result == 0) {
 		__xstat32_conv(&kbuf, buf);
 	}
-#else
+# else
 	struct kernel_stat kbuf;
 
 	result = INLINE_SYSCALL(stat, 2, file_name, &kbuf);
 	if (result == 0) {
 		__xstat_conv(&kbuf, buf);
 	}
-#endif
+# endif /* __NR_stat64 */
 	return result;
 }
+#endif /* __NR_fstat64 */
 libc_hidden_def(stat)
 
-#if ! defined __NR_stat64 && defined __UCLIBC_HAS_LFS__
+#if ! defined __NR_stat64 && ! defined __NR_fstatat64 && \
+	defined __UCLIBC_HAS_LFS__
 strong_alias_untyped(stat,stat64)
 libc_hidden_def(stat64)
 #endif