[Mldonkey-commits] mldonkey distribChangeLog src/daemon/driver/dri...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/06/27 10:24:32

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

Log message:
        patch #5205

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.901&r2=1.902
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/daemon/driver/driverInteractive.ml?cvsroot=mldonkey&r1=1.85&r2=1.86

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -b -r1.901 -r1.902
--- distrib/ChangeLog   22 Jun 2006 19:33:52 -0000      1.901
+++ distrib/ChangeLog   27 Jun 2006 10:24:32 -0000      1.902
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/06/27
+5205: Telnet: Fix another UTF8.length exception in search results
+
 2006/06/22
 5199: BT: Fix BT_client_uid changing between core start (orbit)
 -------------------------------------------------------------------------------

Index: src/daemon/driver/driverInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/daemon/driver/driverInteractive.ml,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- src/daemon/driver/driverInteractive.ml      19 Jun 2006 20:26:08 -0000      
1.85
+++ src/daemon/driver/driverInteractive.ml      27 Jun 2006 10:24:32 -0000      
1.86
@@ -315,7 +315,7 @@
 
 let col_sep = " "
 let add buf s align max_len =
-  let slen = Charset.utf8_length s in
+  let slen = try Charset.utf8_length s with e -> String.length s in
   let diff = max_len - slen in
   match align with
     Align_Center ->
@@ -339,7 +339,7 @@
   List.iter (fun line ->
       let len = Array.length line in
       for i = 0 to len-1 do
-        let slen = Charset.utf8_length line.(i) in
+        let slen = try Charset.utf8_length line.(i) with e -> String.length 
line.(i) in
         if cols.(i) <  slen then cols.(i) <- slen
       done;
   ) (titles :: lines);