From ededb764b496669013198419a56f2ee513d52587 Mon Sep 17 00:00:00 2001
From: Jose Antonio Ortega Ruiz <jao@gnu.org>
Date: Sat, 28 Jul 2012 21:21:35 +0200
Subject: Fixes for DiskU, which was exploding on recent Linux

We're using now the recommended statvfs interface, instead of the
obsolete statfs64.  Moreover, we compute correctly the used space.
---
 src/StatFS.hsc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/StatFS.hsc')

diff --git a/src/StatFS.hsc b/src/StatFS.hsc
index e1cb89c..050c19b 100644
--- a/src/StatFS.hsc
+++ b/src/StatFS.hsc
@@ -54,7 +54,7 @@ data CStatfs
 #ifdef IS_BSD_SYSTEM
 foreign import ccall unsafe "sys/mount.h statfs"
 #else
-foreign import ccall unsafe "sys/vfs.h statfs64"
+foreign import ccall unsafe "sys/statvfs.h statvfs"
 #endif
   c_statfs :: CString -> Ptr CStatfs -> IO CInt
 
@@ -66,7 +66,7 @@ getFileSystemStats path =
   allocaBytes (#size struct statfs) $ \vfs ->
   useAsCString (pack path) $ \cpath -> do
     res <- c_statfs cpath vfs
-    if res == -1 then return Nothing
+    if res /= 0 then return Nothing
       else do
         bsize <- (#peek struct statfs, f_bsize) vfs
         bcount <- (#peek struct statfs, f_blocks) vfs
@@ -79,5 +79,5 @@ getFileSystemStats path =
                        , fsStatByteCount = toI bcount * bpb
                        , fsStatBytesFree = toI bfree * bpb
                        , fsStatBytesAvailable = toI bavail * bpb
-                       , fsStatBytesUsed = toI (max 0 (bcount - bavail)) * bpb
+                       , fsStatBytesUsed = toI (bcount - bfree) * bpb
                        }
-- 
cgit v1.2.3