Author: jonpryor
Date: 2006-11-01 22:45:34 -0500 (Wed, 01 Nov 2006)
New Revision: 67254

Modified:
   trunk/mono/support/ChangeLog
   trunk/mono/support/stdio.c
   trunk/mono/support/sys-statvfs.c
Log:
        * stdio.c: Some BSDs define clearerr(3) as a macro, so we need to cast
          `stream' to a `FILE*' to avoid derefing a `void*'.
        * sys-statvfs.c: Build fix to support OS X 10.3.9 & systems w/o 
statvfs(2).


Modified: trunk/mono/support/ChangeLog
===================================================================
--- trunk/mono/support/ChangeLog        2006-11-02 02:43:16 UTC (rev 67253)
+++ trunk/mono/support/ChangeLog        2006-11-02 03:45:34 UTC (rev 67254)
@@ -1,5 +1,11 @@
 2006-11-01  Jonathan Pryor  <[EMAIL PROTECTED]>
 
+       * stdio.c: Some BSDs define clearerr(3) as a macro, so we need to cast
+         `stream' to a `FILE*' to avoid derefing a `void*'.
+       * sys-statvfs.c: Build fix to support OS X 10.3.9 & systems w/o 
statvfs(2).
+
+2006-11-01  Jonathan Pryor  <[EMAIL PROTECTED]>
+
        * mph.h: Add fallback typedefs for blkcnt_t, blksize_t, suseconds_t so 
that
          map.c can rely on their presence.  (Some versions of OS X don't 
provide
          these typedefs.)

Modified: trunk/mono/support/stdio.c
===================================================================
--- trunk/mono/support/stdio.c  2006-11-02 02:43:16 UTC (rev 67253)
+++ trunk/mono/support/stdio.c  2006-11-02 03:45:34 UTC (rev 67254)
@@ -198,7 +198,7 @@
 Mono_Posix_Stdlib_clearerr (void* stream)
 {
        errno = 0;
-       clearerr (stream);
+       clearerr (((FILE*) stream));
        return errno == 0 ? 0 : -1;
 }
 

Modified: trunk/mono/support/sys-statvfs.c
===================================================================
--- trunk/mono/support/sys-statvfs.c    2006-11-02 02:43:16 UTC (rev 67253)
+++ trunk/mono/support/sys-statvfs.c    2006-11-02 03:45:34 UTC (rev 67254)
@@ -149,25 +149,25 @@
 }
 
 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 (Mono_Posix_FromMountFlags (from->f_flag, &flag) != 0)
                return -1;
+       to->f_flags = flag;
 
        return 0;
 }
@@ -218,7 +218,7 @@
                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);
        }

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to