[Unison-hackers] More patches for 2.10.2

Jerome Vouillon Jerome.Vouillon at pps.jussieu.fr
Fri May 27 17:02:58 EDT 2005


Here are a few more patches for Unison 2.10.2.

-- Jerome
-------------- next part --------------
Disable password prompting code (broken in 2.10.2)
--- unison-2.10.2.orig/uigtk2.ml	2004-09-06 21:15:46.000000000 +0200
+++ unison-2.10.2/uigtk2.ml	2005-05-27 15:36:30.359789539 +0200
@@ -745,8 +745,7 @@
     match Uicommon.sshParse s with
       Uicommon.Password account -> getPassword account
     | _ -> "" in
-  if Osx.isMacOSX or Osx.isLinux then Some handleSSH
-  else None
+  None
 
 (* ------ *)
 
-------------- next part --------------
Use aligned writes for better performances (especially on USB devices).
diff -ur unison-2.10.2.orig/uutil.ml unison-2.10.2/uutil.ml
--- unison-2.10.2.orig/uutil.ml	2004-09-06 21:15:47.000000000 +0200
+++ unison-2.10.2/uutil.ml	2005-05-27 15:33:26.280668342 +0200
@@ -83,7 +83,7 @@
 (*               Copy bytes from one file_desc to another                    *)
 (*****************************************************************************)
 
-let bufsize = 10000
+let bufsize = 16384
 let bufsizeFS = Filesize.ofInt bufsize
 let buf = String.create bufsize
 
-------------- next part --------------
--- unison-2.10.2.orig/props.ml	2004-09-06 21:15:46.000000000 +0200
+++ unison-2.10.2/props.ml	2005-05-27 15:51:40.838109037 +0200
@@ -421,7 +421,7 @@
 
 let iCanWrite p =
   try
-    Unix.access p [Unix.R_OK];
+    Unix.access p [Unix.W_OK];
     true
   with
     Unix.Unix_error _ -> false
@@ -615,9 +615,9 @@
 let set fspath path kind p =
   Uid.set fspath path kind p.uid;
   Gid.set fspath path kind p.gid;
-  Perm.set fspath path kind p.perm;
+  TypeCreator.set fspath path kind p.typeCreator;
   Time.set fspath path kind p.time;
-  TypeCreator.set fspath path kind p.typeCreator
+  Perm.set fspath path kind p.perm
 
 let init someHostIsRunningWindows =
   Perm.init someHostIsRunningWindows;


More information about the Unison-hackers mailing list