Merge pull request #5714 from alexischr/update_bockbuild

[mono.git] / support / sys-statvfs.c

diff --git a/support/sys-statvfs.c b/support/sys-statvfs.c
index 51416e57cbe7341a0ada9dd9209ea7841b35bea6..128baaa03b34c76cfc22dfdd02f732ad8bcb55d9 100644 (file)
--- a/support/sys-statvfs.c
+++ b/support/sys-statvfs.c
@@ -14,17 +14,27 @@
 #include "mph.h"
 #include "map.h"
 
+#ifdef HAVE_PATHCONF_H
+#include <pathconf.h>
+#endif
+
 #ifdef HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
+#elif defined (HAVE_STATFS) || defined (HAVE_FSTATFS)
+#include <sys/vfs.h>
 #endif /* def HAVE_SYS_STATVFS_H */
 
 #ifdef HAVE_GETFSSTAT
+#ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
+#endif
 #include <sys/ucred.h>
 #include <sys/mount.h>
 #include <unistd.h>     /* for pathconf */
 #endif /* def HAVE_GETFSSTAT */
 
+#include "mono/utils/mono-compiler.h"
+
 G_BEGIN_DECLS
 
 #ifdef HAVE_SYS_STATVFS_H
@@ -121,9 +131,11 @@ Mono_Posix_Syscall_fstatvfs (gint32 fd, struct Mono_Posix_Statvfs *buf)
  * BSD-compatible definitions.
  *
  * Linux also provides these, but are deprecated in favor of (f)statvfs.
+ * Android NDK unified headers define HAVE_FSTATFS but also HAVE_SYS_STATVFS_H
+ * which makes these duplicates of the functions defined above
  */
 
-#if (defined (HAVE_STATFS) || defined (HAVE_FSTATFS)) && !defined (HAVE_STATVFS)
+#if (defined (HAVE_STATFS) || defined (HAVE_FSTATFS)) && !defined (HAVE_STATVFS) && !defined(ANDROID_UNIFIED_HEADERS)
 int
 Mono_Posix_ToStatvfs (void *_from, struct Mono_Posix_Statvfs *to)
 {
@@ -142,32 +154,36 @@ Mono_Posix_ToStatvfs (void *_from, struct Mono_Posix_Statvfs *to)
        // so this shouldn't lose anything.
        memcpy (&to->f_fsid, &from->f_fsid, sizeof(to->f_fsid));
 
+#if HAVE_STRUCT_STATFS_F_FLAGS
        if (Mono_Posix_ToMountFlags (from->f_flags, &to->f_flag) != 0)
                return -1;
+#endif  /* def HAVE_STRUCT_STATFS_F_FLAGS */
 
        return 0;
 }
 
 int
-Mono_Posix_FromStatvfs (struct Mono_Posix_Statvfs *from, void *to)
+Mono_Posix_FromStatvfs (struct Mono_Posix_Statvfs *from, void *_to)
 {
        struct statfs *to = _to;
+       guint64 flag;
 
        to->f_bsize   = from->f_bsize;
-       to->f_frsize  = from->f_bsize;
        to->f_blocks  = from->f_blocks;
        to->f_bfree   = from->f_bfree;
        to->f_bavail  = from->f_bavail;
        to->f_files   = from->f_files;
        to->f_ffree   = from->f_ffree;
-       to->f_favail  = from->f_ffree; /* OSX doesn't have f_avail */
 
        // from->f_fsid is an int32[2], to->f_fsid is a uint64, 
        // so this shouldn't lose anything.
        memcpy (&to->f_fsid, &from->f_fsid, sizeof(to->f_fsid));
 
-       if (Mono_Posix_FromMountFlags (from->f_flags, &to->f_flag) != 0)
+#if HAVE_STRUCT_STATFS_F_FLAGS
+       if (Mono_Posix_FromMountFlags (from->f_flag, &flag) != 0)
                return -1;
+       to->f_flags = flag;
+#endif  /* def HAVE_STRUCT_STATFS_F_FLAGS */
 
        return 0;
 }
@@ -185,7 +201,7 @@ set_fnamemax (int fd, struct Mono_Posix_Statvfs *buf)
 }
 #endif /* (def HAVE_STATFS || def HAVE_FSTATFS) && !def HAVE_STATVFS */
 
-#if !defined (HAVE_STATVFS) && defined (HAVE_STATFS)
+#if !defined (HAVE_STATVFS) && defined (HAVE_STATFS) && (!defined(ANDROID_UNIFIED_HEADERS) || __ANDROID_API__ >= 19)
 gint32
 Mono_Posix_Syscall_statvfs (const char *path, struct Mono_Posix_Statvfs *buf)
 {
@@ -206,7 +222,7 @@ Mono_Posix_Syscall_statvfs (const char *path, struct Mono_Posix_Statvfs *buf)
 }
 #endif /* !def HAVE_STATVFS && def HAVE_STATFS */
 
-#if !defined (HAVE_STATVFS) && defined (HAVE_STATFS)
+#if !defined (HAVE_STATVFS) && defined (HAVE_STATFS) && (!defined(ANDROID_UNIFIED_HEADERS) || __ANDROID_API__ >= 19)
 gint32
 Mono_Posix_Syscall_fstatvfs (gint32 fd, struct Mono_Posix_Statvfs *buf)
 {
@@ -218,7 +234,7 @@ Mono_Posix_Syscall_fstatvfs (gint32 fd, struct Mono_Posix_Statvfs *buf)
                return -1;
        }
 
-       if ((r = statfs (path, &s)) == 0 &&
+       if ((r = fstatfs (fd, &s)) == 0 &&
                        (r = Mono_Posix_ToStatvfs (&s, buf)) == 0) {
                set_fnamemax (fd, buf);
        }