[git commit] fstat: Use fstat64 if arch does not have the fstat syscall
Bernhard Reutner-Fischer
rep.dot.nop at gmail.com
Wed Feb 20 12:45:12 UTC 2013
commit: http://git.uclibc.org/uClibc/commit/?id=b34c8a4698b14f480f852d095ee02a7274046c9d
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/fstat.c | 28 ++++++++++++++++++++++++----
libc/sysdeps/linux/common/fstat64.c | 4 ++++
2 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/libc/sysdeps/linux/common/fstat.c b/libc/sysdeps/linux/common/fstat.c
index 4726a68..696f79e 100644
--- a/libc/sysdeps/linux/common/fstat.c
+++ b/libc/sysdeps/linux/common/fstat.c
@@ -12,10 +12,28 @@
#include <sys/stat.h>
#include "xstatconv.h"
+#if defined __NR_fstat64 && !defined __NR_fstat
+int fstat(int fd, struct stat *buf)
+{
+ int result = INLINE_SYSCALL(fstat64, 2, fd, buf);
+ if (result == 0) {
+ /* Did we overflow? */
+ if (buf->__pad1 || buf->__pad2 || buf->__pad3
+ || buf->__pad4 || buf->__pad5
+ || buf->__pad6 || buf->__pad7) {
+ __set_errno(EOVERFLOW);
+ return -1;
+ }
+ }
+ return result;
+}
+libc_hidden_def(fstat)
+
+#elif defined __NR_fstat
int fstat(int fd, struct stat *buf)
{
int result;
-#ifdef __NR_fstat64
+# ifdef __NR_fstat64
/* normal stat call has limited values for various stat elements
* e.g. uid device major/minor etc.
* so we use 64 variant if available
@@ -26,19 +44,21 @@ int fstat(int fd, struct stat *buf)
if (result == 0) {
__xstat32_conv(&kbuf, buf);
}
-#else
+# else
struct kernel_stat kbuf;
result = INLINE_SYSCALL(fstat, 2, fd, &kbuf);
if (result == 0) {
__xstat_conv(&kbuf, buf);
}
-#endif
+# endif
return result;
}
libc_hidden_def(fstat)
-#if ! defined __NR_fstat64 && defined __UCLIBC_HAS_LFS__
+# if ! defined __NR_fstat64 && defined __UCLIBC_HAS_LFS__
strong_alias_untyped(fstat,fstat64)
libc_hidden_def(fstat64)
+# endif
+
#endif
diff --git a/libc/sysdeps/linux/common/fstat64.c b/libc/sysdeps/linux/common/fstat64.c
index 7460c26..aaaf03e 100644
--- a/libc/sysdeps/linux/common/fstat64.c
+++ b/libc/sysdeps/linux/common/fstat64.c
@@ -20,6 +20,7 @@ static __always_inline _syscall2(int, __syscall_fstat64,
int fstat64(int fd, struct stat64 *buf)
{
+#ifdef __ARCH_HAS_DEPRECATED_SYSCALLS__
int result;
struct kernel_stat64 kbuf;
@@ -28,6 +29,9 @@ int fstat64(int fd, struct stat64 *buf)
__xstat64_conv(&kbuf, buf);
}
return result;
+#else
+ return __syscall_fstat64(fd, buf);
+#endif
}
libc_hidden_def(fstat64)
#endif
More information about the uClibc-cvs
mailing list