[prev in list] [next in list] [prev in thread] [next in thread] 

List:       uclibc
Subject:    [PATCH v3 30/48] statfs: Use statfs64 if arch does not have the statfs syscall
From:       Markos Chandras <markos.chandras () gmail ! com>
Date:       2013-01-23 11:41:54
Message-ID: 1358941332-6190-31-git-send-email-markos.chandras () gmail ! com
[Download RAW message or body]

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

Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
---
 include/sys/statfs.h               |  1 +
 libc/sysdeps/linux/common/statfs.c | 31 ++++++++++++++++++++++++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/include/sys/statfs.h b/include/sys/statfs.h
index 0b90c13..ab74b0b 100644
--- a/include/sys/statfs.h
+++ b/include/sys/statfs.h
@@ -30,6 +30,7 @@ __BEGIN_DECLS
 #ifndef __USE_FILE_OFFSET64
 extern int statfs (const char *__file, struct statfs *__buf)
      __THROW __nonnull ((1, 2));
+libc_hidden_proto(statfs)
 #else
 # ifdef __REDIRECT_NTH
 extern int __REDIRECT_NTH (statfs,
diff --git a/libc/sysdeps/linux/common/statfs.c b/libc/sysdeps/linux/common/statfs.c
index d24bc9d..bb02309 100644
--- a/libc/sysdeps/linux/common/statfs.c
+++ b/libc/sysdeps/linux/common/statfs.c
@@ -12,11 +12,40 @@
 #include <sys/param.h>
 #include <sys/vfs.h>
 
+#if defined(__NR_statfs64) && !defined(__NR_statfs)
 extern __typeof(statfs) __libc_statfs attribute_hidden;
+
+int __libc_statfs(const char *path, struct statfs *buf)
+{
+	int err = INLINE_SYSCALL(statfs64, 3, path, 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;
+}
+#if defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__
+/* statfs is used by NPTL, so it must exported in case */
+weak_alias(__libc_statfs, statfs)
+#endif
+
+/* For systems which have both, prefer the old one */
+#else
+extern __typeof(statfs) __libc_statfs attribute_hidden;
+
 #define __NR___libc_statfs __NR_statfs
 _syscall2(int, __libc_statfs, const char *, path, struct statfs *, buf)
 
 #if defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__
 /* statfs is used by NPTL, so it must exported in case */
-weak_alias(__libc_statfs,statfs)
+weak_alias(__libc_statfs, statfs)
+#endif
+
 #endif
+libc_hidden_def(statfs)
-- 
1.8.1.1


_______________________________________________
uClibc mailing list
uClibc@uclibc.org
http://lists.busybox.net/mailman/listinfo/uclibc
[prev in list] [next in list] [prev in thread] [next in thread]