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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/12/19 10:10:24

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonComplexOptions.ml 
        src/utils/cdk  : tar.mlcpp 

Log message:
        patch #7412

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1505&r2=1.1506
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/common/commonComplexOptions.ml?cvsroot=mldonkey&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/utils/cdk/tar.mlcpp?cvsroot=mldonkey&r1=1.3&r2=1.4

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1505
retrieving revision 1.1506
diff -u -b -r1.1505 -r1.1506
--- distrib/ChangeLog   19 Dec 2010 10:04:58 -0000      1.1505
+++ distrib/ChangeLog   19 Dec 2010 10:10:24 -0000      1.1506
@@ -15,6 +15,7 @@
 =========
 
 2010/12/19
+7412: tar.gzip: fix harmless error message (ygrek)
 7388: DC: fix sharing on Windows (ygrek)
 -------------------------------------------------------------------------------
 2010/11/15: version 3.0.6 = tag release-3-0-6

Index: src/daemon/common/commonComplexOptions.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/common/commonComplexOptions.ml,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- src/daemon/common/commonComplexOptions.ml   18 Mar 2008 08:24:37 -0000      
1.83
+++ src/daemon/common/commonComplexOptions.ml   19 Dec 2010 10:10:24 -0000      
1.84
@@ -1163,11 +1163,6 @@
            header, s) in
        Tar.output otar header s
       with
-      | (Gzip.Error "error during compression") as e when Autoconf.windows && 
arg = "fasttrack.ini" ->
-         (* for whatever reason this error is raised on Windows,
-             but fasttrack.ini is stored correctly *)
-         if !verbose then
-            lprintf_nl "Tar: Windows specific pseudo error %s in %s" 
(Printexc2.to_string e) arg
       | e ->
          failed_files := arg :: !failed_files;
          lprintf_nl "Tar: skipping %s, error %s" arg (Printexc2.to_string e)

Index: src/utils/cdk/tar.mlcpp
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/utils/cdk/tar.mlcpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/utils/cdk/tar.mlcpp     7 Nov 2010 15:01:40 -0000       1.3
+++ src/utils/cdk/tar.mlcpp     19 Dec 2010 10:10:24 -0000      1.4
@@ -416,16 +416,7 @@
          t.ochan#output buf2 0 blocksize
       end;
       if size > 0 then begin
-       let blocks = size / blocksize in
-         for n = 0 to blocks do
-           let pos = n * blocksize in
-           let len =
-             if size - pos >= blocksize then
-               blocksize
-             else
-               size - pos in
-             t.ochan#output body (n * 512) len;
-         done;  
+    t.ochan#output body 0 size;
          let align = blocksize - (size mod blocksize) in
            if align > 0 && align < blocksize then 
              t.ochan#output empty_block 0 align