From: Markos Chandras <markos.chand...@imgtec.com>
New architectures don't have fstatfs anymore, so we use a wrapper for
__libc_fstatfs which will use fstatfs64 internally. The interface however
needs to remain the same (i.e accepting a struct statfs as a second
argument) for backwards compatibility
Signed-off-by: Markos Chandras <markos.chand...@imgtec.com>
---
libc/sysdeps/linux/common/fstatfs.c | 21 ++++++++++++++++++++-
libc/sysdeps/linux/common/stubs.c | 3 ++-
2 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/libc/sysdeps/linux/common/fstatfs.c
b/libc/sysdeps/linux/common/fstatfs.c
index fa0024a..09ac1de 100644
--- a/libc/sysdeps/linux/common/fstatfs.c
+++ b/libc/sysdeps/linux/common/fstatfs.c
@@ -9,8 +9,9 @@
#include <sys/syscall.h>
#include <sys/vfs.h>
+#include <string.h>
-#ifndef __USE_FILE_OFFSET64
+#if ! defined(__USE_FILE_OFFSET64)
extern int fstatfs (int __fildes, struct statfs *__buf)
__THROW __nonnull ((2));
#else
@@ -23,8 +24,26 @@ extern int __REDIRECT_NTH (fstatfs, (int __fildes, struct
statfs *__buf),
#endif
extern __typeof(fstatfs) __libc_fstatfs attribute_hidden;
+#ifdef __NR_fstatfs
#define __NR___libc_fstatfs __NR_fstatfs
_syscall2(int, __libc_fstatfs, int, fd, struct statfs *, buf)
+#else
+int __libc_fstatfs (int __fildes, struct statfs *__buf)
+{
+ int err = INLINE_SYSCALL(fstatfs64, 3, __fildes, sizeof(*__buf), __buf);
+
+ if (err == 0) {
+ /* Did we overflow? */
+ if (__buf->__pad1 || __buf->__pad2 || __buf->__pad3 ||
+ __buf->__pad4 || __buf->__pad5) {
+ __set_errno(EOVERFLOW);
+ return -1;
+ }
+ }
+ return err;
+};
+/* Redefined fstatfs because we need it for backwards compatibility */
+#endif /* __NR_fstatfs */
#if defined __UCLIBC_LINUX_SPECIFIC__
weak_alias(__libc_fstatfs,fstatfs)
diff --git a/libc/sysdeps/linux/common/stubs.c
b/libc/sysdeps/linux/common/stubs.c
index 72411e0..ad8d0b8 100644
--- a/libc/sysdeps/linux/common/stubs.c
+++ b/libc/sysdeps/linux/common/stubs.c
@@ -140,7 +140,8 @@ make_stub(fremovexattr)
make_stub(fsetxattr)
#endif
-#if !defined __NR_fstatfs && defined __UCLIBC_LINUX_SPECIFIC__
+#if !defined __NR_fstatfs && !defined(__NR_fstatfs64) \
+ && defined __UCLIBC_LINUX_SPECIFIC__
make_stub(fstatfs)
#endif
--
1.8.1.1
_______________________________________________
uClibc mailing list
uClibc@uclibc.org
http://lists.busybox.net/mailman/listinfo/uclibc
