[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       07/07/03 14:13:44

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonInteractive.ml 
        src/daemon/driver: driverCommands.ml 
        src/networks/bittorrent: bTInteractive.ml 
        src/utils/lib  : unix32.ml unix32.mli 

Log message:
        patch #6068

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1298&r2=1.1299
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonInteractive.ml?cvsroot=mldonkey&r1=1.99&r2=1.100
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverCommands.ml?cvsroot=mldonkey&r1=1.240&r2=1.241
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.140&r2=1.141
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/unix32.ml?cvsroot=mldonkey&r1=1.70&r2=1.71
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/lib/unix32.mli?cvsroot=mldonkey&r1=1.25&r2=1.26

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1298
retrieving revision 1.1299
diff -u -b -r1.1298 -r1.1299
--- distrib/ChangeLog   1 Jul 2007 21:58:08 -0000       1.1298
+++ distrib/ChangeLog   3 Jul 2007 14:13:43 -0000       1.1299
@@ -14,6 +14,10 @@
 ChangeLog
 =========
 
+2007/07/03
+6068: BT: Fix download start when torrents/downloads filesystem
+      allows more than 16M chars
+
 2007/07/01
 6064: BT: Earlier first scan of torrents/incoming/*
 6053: HTML: Send correct filename when previewing (chandlerding)

Index: src/daemon/common/commonInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonInteractive.ml,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -b -r1.99 -r1.100
--- src/daemon/common/commonInteractive.ml      1 Jul 2007 12:59:24 -0000       
1.99
+++ src/daemon/common/commonInteractive.ml      3 Jul 2007 14:13:44 -0000       
1.100
@@ -132,12 +132,8 @@
   let fs = Unix32.filesystem incoming_dir in
   let namemax =
     match Unix32.fnamelen incoming_dir with
-      None -> 0
-    | Some v ->
-        if v > Int64.of_int Sys.max_string_length then
-          Sys.max_string_length
-        else
-          Int64.to_int v
+    | None -> 0
+    | Some v -> v
   in
   let new_name =
     Filename2.filesystem_compliant 

Index: src/daemon/driver/driverCommands.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverCommands.ml,v
retrieving revision 1.240
retrieving revision 1.241
diff -u -b -r1.240 -r1.241
--- src/daemon/driver/driverCommands.ml 1 Jul 2007 12:58:54 -0000       1.240
+++ src/daemon/driver/driverCommands.ml 3 Jul 2007 14:13:44 -0000       1.241
@@ -2359,12 +2359,15 @@
         let print_i64o = function
           | None -> "Unknown"
           | Some v -> Printf.sprintf "%Ld" v in
+        let print_io = function
+          | None -> "Unknown"
+          | Some v -> Printf.sprintf "%d" v in
          Printf.bprintf buf "working on dir %s\n" arg;
          Printf.bprintf buf "bsize %s\n" (print_i64o (Unix32.bsize arg));
          Printf.bprintf buf "blocks %s\n" (print_i64o (Unix32.blocks arg));
          Printf.bprintf buf "bfree %s\n" (print_i64o (Unix32.bfree arg));
          Printf.bprintf buf "bavail %s\n" (print_i64o (Unix32.bavail arg));
-         Printf.bprintf buf "fnamelen %s\n" (print_i64o (Unix32.fnamelen arg));
+         Printf.bprintf buf "fnamelen %s\n" (print_io (Unix32.fnamelen arg));
          Printf.bprintf buf "filesystem %s\n" (Unix32.filesystem arg);
         let print_i64o_amount = function
           | None -> "Unknown"

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -b -r1.140 -r1.141
--- src/networks/bittorrent/bTInteractive.ml    30 Jun 2007 17:54:11 -0000      
1.140
+++ src/networks/bittorrent/bTInteractive.ml    3 Jul 2007 14:13:44 -0000       
1.141
@@ -650,7 +650,8 @@
     let namemax =
       match Unix32.fnamelen downloads_directory with
       | None -> 0
-      | Some v -> Int64.to_int v in
+      | Some v -> v
+    in
     Filename.concat downloads_directory
     (Filename2.filesystem_compliant torrent.torrent_name fs namemax) ^ 
".torrent"
     in

Index: src/utils/lib/unix32.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/unix32.ml,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -b -r1.70 -r1.71
--- src/utils/lib/unix32.ml     8 May 2007 12:38:20 -0000       1.70
+++ src/utils/lib/unix32.ml     3 Jul 2007 14:13:44 -0000       1.71
@@ -1675,7 +1675,7 @@
   f_files : int64;  (* total file nodes in file system *)
   f_ffree : int64;  (* free file nodes in fs *)
   f_fsid : unit;  (* See note in statfs(2) *)
-  f_fnamelen : int64; (* maximum length of filenames *)
+  f_fnamelen : int; (* maximum length of filenames, maximum 
Sys.max_string_length *)
   f_basetype : string; (* type of filesystem - Solaris, (-1) on other systems, 
use f_type there *)
   f_frsize : int64;  (* Fundamental file system block size, (-1) if not 
provided by system *)
 }
@@ -1704,26 +1704,22 @@
 
 let blocks dir =
   try
-    let s = statfs dir in
-    Some s.f_blocks
+    Some (statfs dir).f_blocks
   with e -> None
 
 let bfree dir =
   try
-    let s = statfs dir in
-    Some s.f_bfree
+    Some (statfs dir).f_bfree
   with e -> None
 
 let bavail dir =
   try
-    let s = statfs dir in
-    Some s.f_bavail
+    Some (statfs dir).f_bavail
   with e -> None
 
 let fnamelen dir =
   try
-    let s = statfs dir in
-    Some s.f_fnamelen
+    Some (min (statfs dir).f_fnamelen Sys.max_string_length)
   with e -> None
 
 let disktotal dir =

Index: src/utils/lib/unix32.mli
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/lib/unix32.mli,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- src/utils/lib/unix32.mli    22 Apr 2007 22:31:53 -0000      1.25
+++ src/utils/lib/unix32.mli    3 Jul 2007 14:13:44 -0000       1.26
@@ -98,7 +98,7 @@
 val blocks : string -> int64 option
 val bfree : string -> int64 option
 val bavail : string -> int64 option
-val fnamelen : string -> int64 option
+val fnamelen : string -> int option
 val disktotal : string -> int64 option
 val diskfree : string -> int64 option
 val diskused : string -> int64 option