[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/03/15 20:55:15

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTGlobals.ml bTInteractive.ml 

Log message:
        patch #4971

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.767&tr2=1.768&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml.diff?tr1=1.52&tr2=1.53&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.86&tr2=1.87&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.767 mldonkey/distrib/ChangeLog:1.768
--- mldonkey/distrib/ChangeLog:1.767    Wed Mar 15 20:54:00 2006
+++ mldonkey/distrib/ChangeLog  Wed Mar 15 20:55:15 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/03/15
+4971: BT: Allow read-only access for shared files
 4967: CommonUserDb: Keep old user database updated for easy downgrades
 
 2006/03/09
Index: mldonkey/src/networks/bittorrent/bTGlobals.ml
diff -u mldonkey/src/networks/bittorrent/bTGlobals.ml:1.52 
mldonkey/src/networks/bittorrent/bTGlobals.ml:1.53
--- mldonkey/src/networks/bittorrent/bTGlobals.ml:1.52  Sun Mar  5 10:40:04 2006
+++ mldonkey/src/networks/bittorrent/bTGlobals.ml       Wed Mar 15 20:55:15 2006
@@ -164,14 +164,19 @@
 let add_torrent_infos file trackers =
   file.file_trackers <- trackers @ file.file_trackers
 
-let create_temp_file file_temp file_files =
-  if !verbose then lprintf_nl () "create_temp_file %s" file_temp;
+let create_temp_file file_temp file_files file_state =
+  if !verbose then lprintf_nl () "create_temp_file %s - %s" file_temp 
(string_of_state file_state);
+  let writable =
+    if file_state = FileShared then
+      false
+    else
+      true
+  in
   let file_fd =
     if file_files <> [] then
-      Unix32.create_multifile file_temp
-        true file_files
+      Unix32.create_multifile file_temp writable file_files
     else
-      Unix32.create_rw file_temp
+      Unix32.create_diskfile file_temp writable
   in
   if Unix32.destroyed file_fd then
     failwith
@@ -208,7 +213,7 @@
   try
     Hashtbl.find files_by_uid file_id
   with Not_found ->
-      let file_fd = create_temp_file file_temp t.torrent_files in
+      let file_fd = create_temp_file file_temp t.torrent_files file_state in
       let rec file = {
           file_tracker_connected = false;
           file_file = file_impl;
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.86 
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.87
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.86      Thu Mar  9 
12:56:59 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml   Wed Mar 15 20:55:15 2006
@@ -110,7 +110,7 @@
 
 (* During the commit operation, for security, the file_fd is destroyed. So
   we create it again to be able to share this file again. *)
-      set_file_fd (as_file file) (create_temp_file new_name file.file_files);
+      set_file_fd (as_file file) (create_temp_file new_name file.file_files 
(file_state file));
 
       if Unix32.destroyed (file_fd file) then
         lprintf_nl () "op_file_commit: FD is destroyed... could not repair!";