[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/driver/dr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/07/14 13:17:52

Modified files:
        distrib        : ChangeLog 
        src/daemon/driver: driverInteractive.ml 
        src/utils/lib  : unix32.ml 

Log message:
        patch #5238

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.911&r2=1.912
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/unix32.ml?cvsroot=mldonkey&r1=1.63&r2=1.64

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.911
retrieving revision 1.912
diff -u -b -r1.911 -r1.912
--- distrib/ChangeLog   14 Jul 2006 13:15:39 -0000      1.911
+++ distrib/ChangeLog   14 Jul 2006 13:17:52 -0000      1.912
@@ -15,6 +15,7 @@
 =========
 
 2006/07/14
+5238: Fix HDD space checks on CFS mounts
 5235: Lock config_files_space.tmp and delete unused file on startup
 5232: GUI: Fix decoding bug for Gnutella/G2/Fasttrack search results (zet)
 

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- src/daemon/driver/driverInteractive.ml      27 Jun 2006 21:20:28 -0000      
1.87
+++ src/daemon/driver/driverInteractive.ml      14 Jul 2006 13:17:52 -0000      
1.88
@@ -93,6 +93,7 @@
   let dir_full dir mb =
     match Unix32.diskfree dir with
     | None -> false
+    | Some v when ((Unix32.filesystem dir = "NFS_SUPER_MAGIC") && v = zero) -> 
false
     | Some v -> v < megabytes mb
   in
 

Index: src/utils/lib/unix32.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/unix32.ml,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- src/utils/lib/unix32.ml     25 May 2006 19:47:25 -0000      1.63
+++ src/utils/lib/unix32.ml     14 Jul 2006 13:17:52 -0000      1.64
@@ -1794,14 +1794,22 @@
 (* percentage of used disk space *)
   match diskfree dir, disktotal dir with
   | Some dfree, Some dtotal ->
+      begin
+       try
       Some (Int64.to_int (100L -- (dfree ** 100L // dtotal)))
+        with Division_by_zero -> None
+      end
   | _ -> None
 
 let percentfree dir =
 (* percentage of free disk space *)
   match diskfree dir, disktotal dir with
   | Some dfree, Some dtotal ->
+      begin
+       try
       Some (Int64.to_int (dfree ** 100L // dtotal))
+       with Division_by_zero -> None
+      end
   | _ -> None
 
 let filesystem dir =