* DataGrid.cs: move back to a more lazy scheme for creating the

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

diff --git a/support/sys-statvfs.c b/support/sys-statvfs.c
index ce18cc9a33cbc8f160dc22e9119f4e45242d52dd..81680619767e576290685474a9e6a889f1c8be3d 100644 (file)
--- a/support/sys-statvfs.c
+++ b/support/sys-statvfs.c
@@ -9,7 +9,10 @@
 
 #include <errno.h>
 
+#include <string.h>
+
 #include "mph.h"
+#include "map.h"
 
 #ifdef HAVE_SYS_STATVFS_H
 #include <sys/statvfs.h>
@@ -51,7 +54,7 @@ copy_statvfs (struct Mono_Posix_Statvfs *to, struct statvfs *from)
   to->f_ffree   = from->f_ffree;
   to->f_favail  = from->f_favail;
   to->f_fsid    = from->f_fsid;
-  to->f_flag    = from->f_flag;
+  Mono_Posix_ToMountFlags (from->f_flag, &to->f_flag);
   to->f_namemax =      from->f_namemax;
 }
 #endif /* ndef HAVE_SYS_STATVFS_H */
@@ -109,15 +112,17 @@ static void
 copy_statfs (struct Mono_Posix_Statvfs *to, struct statfs *from)
 {
   to->f_bsize   = from->f_bsize;
-  to->f_frsize  = from->f_frsize;
+  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 */
-  to->f_fsid    = from->f_fsid;
-  to->f_flag    = from->f_flags;
+  Mono_Posix_ToMountFlags (from->f_flags, &to->f_flag);
+       // 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));
 }
 
 static void
@@ -125,6 +130,12 @@ set_namemax (const char *path, struct Mono_Posix_Statvfs *buf)
 {
   buf->f_namemax = pathconf (path, _PC_NAME_MAX);
 }
+
+static void
+set_fnamemax (int fd, struct Mono_Posix_Statvfs *buf)
+{
+  buf->f_namemax = fpathconf (fd, _PC_NAME_MAX);
+}
 #endif /* (def HAVE_STATFS || def HAVE_FSTATFS) && !def HAVE_STATVFS */
 
 #if !defined (HAVE_STATVFS) && defined (HAVE_STATFS)
@@ -161,8 +172,8 @@ Mono_Posix_Syscall_fstatvfs (gint32 fd, struct Mono_Posix_Statvfs *buf)
        }
 
        if ((r = fstatfs (fd, &s)) == 0) {
-               copy_statvfs (buf, &s);
-               set_namemax (path, buf);
+               copy_statfs (buf, &s);
+               set_fnamemax (fd, buf);
        }
 
        return r;