diff options
| author | Markos Chandras <markos.chandras@imgtec.com> | 2012-10-11 11:38:44 +0100 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2013-02-20 13:45:12 +0100 |
| commit | a1a76682c458e7d6bb654ddb42135c7be8872a9d (patch) | |
| tree | 21efc7fd9780dd2090335c37c41525527341c637 | |
| parent | 92b784d6a58d8baa52289bea6a286752c3e6200e (diff) | |
statfs: Use statfs64 if arch does not have the statfs syscall
Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
| -rw-r--r-- | include/sys/statfs.h | 1 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/statfs.c | 35 |
2 files changed, 33 insertions, 3 deletions
diff --git a/include/sys/statfs.h b/include/sys/statfs.h index 0b90c1319..ab74b0bbd 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 d24bc9d0c..aae4738ea 100644 --- a/libc/sysdeps/linux/common/statfs.c +++ b/libc/sysdeps/linux/common/statfs.c @@ -13,10 +13,39 @@ #include <sys/vfs.h> extern __typeof(statfs) __libc_statfs attribute_hidden; -#define __NR___libc_statfs __NR_statfs + +#if defined __NR_statfs64 && !defined __NR_statfs + +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 + +# 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__ +# 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) |