Merge PR#134: Enable `-safe-string`

6 files changed, 22 insertions, 20 deletions

diff --git a/lib/cThread.ml b/lib/cThread.ml
index 4f60a69745..9f642b3cec 100644
--- a/lib/cThread.ml
+++ b/lib/cThread.ml
@@ -36,7 +36,7 @@ let really_read_fd fd s off len =
 let really_read_fd_2_oc fd oc len =
   let i = ref 0 in
   let size = 4096 in
-  let s = String.create size in
+  let s = Bytes.create size in
   while !i < len do
     let len = len - !i in
     let r = thread_friendly_read_fd fd s ~off:0 ~len:(min len size) in
@@ -55,11 +55,13 @@ let thread_friendly_really_read_line ic =
   try
     let fd = Unix.descr_of_in_channel ic in
     let b = Buffer.create 1024 in
-    let s = String.make 1 '\000' in
-    while s <> "\n" do
+    let s = Bytes.make 1 '\000' in
+    let endl = Bytes.of_string "\n" in
+    (* Bytes.equal is in 4.03.0 *)
+    while Bytes.compare s endl <> 0 do
       let n = thread_friendly_read_fd fd s ~off:0 ~len:1 in
       if n = 0 then raise End_of_file;
-      if s <> "\n" then Buffer.add_string b s;
+      if Bytes.compare s endl <> 0 then Buffer.add_bytes b s;
     done;
     Buffer.contents b
   with Unix.Unix_error _ -> raise End_of_file
@@ -67,15 +69,15 @@ let thread_friendly_really_read_line ic =
 let thread_friendly_input_value ic =
   try
     let fd = Unix.descr_of_in_channel ic in
-    let header = String.create Marshal.header_size in
+    let header = Bytes.create Marshal.header_size in
     really_read_fd fd header 0 Marshal.header_size;
     let body_size = Marshal.data_size header 0 in
     let desired_size = body_size + Marshal.header_size in
     if desired_size <= Sys.max_string_length then begin
-      let msg = String.create desired_size in
-      String.blit header 0 msg 0 Marshal.header_size;
+      let msg = Bytes.create desired_size in
+      Bytes.blit header 0 msg 0 Marshal.header_size;
       really_read_fd fd msg Marshal.header_size body_size;
-      Marshal.from_string msg 0
+      Marshal.from_bytes msg 0
     end else begin
       (* Workaround for 32 bit systems and data > 16M *)
       let name, oc =
diff --git a/lib/cThread.mli b/lib/cThread.mli
index 7302dfb558..36477a1160 100644
--- a/lib/cThread.mli
+++ b/lib/cThread.mli
@@ -19,8 +19,8 @@ val prepare_in_channel_for_thread_friendly_io : in_channel -> thread_ic
 
 val thread_friendly_input_value : thread_ic -> 'a
 val thread_friendly_read :
-  thread_ic -> string -> off:int -> len:int -> int
+  thread_ic -> Bytes.t -> off:int -> len:int -> int
 val thread_friendly_really_read :
-  thread_ic -> string -> off:int -> len:int -> unit
+  thread_ic -> Bytes.t -> off:int -> len:int -> unit
 val thread_friendly_really_read_line : thread_ic -> string
 
diff --git a/lib/cUnix.ml b/lib/cUnix.ml
index cb436511fb..2542b9751b 100644
--- a/lib/cUnix.ml
+++ b/lib/cUnix.ml
@@ -91,15 +91,15 @@ let rec waitpid_non_intr pid =
 let run_command ?(hook=(fun _ ->())) c =
   let result = Buffer.create 127 in
   let cin,cout,cerr = Unix.open_process_full c (Unix.environment ()) in
-  let buff = String.make 127 ' ' in
-  let buffe = String.make 127 ' ' in
+  let buff = Bytes.make 127 ' ' in
+  let buffe = Bytes.make 127 ' ' in
   let n = ref 0 in
   let ne = ref 0 in
   while n:= input cin buff 0 127 ; ne := input cerr buffe 0 127 ;
     !n+ !ne <> 0
   do
-    let r = String.sub buff 0 !n in (hook r; Buffer.add_string result r);
-    let r = String.sub buffe 0 !ne in (hook r; Buffer.add_string result r);
+    let r = Bytes.sub buff 0 !n in (hook r; Buffer.add_bytes result r);
+    let r = Bytes.sub buffe 0 !ne in (hook r; Buffer.add_bytes result r);
   done;
   (Unix.close_process_full (cin,cout,cerr),  Buffer.contents result)
 
diff --git a/lib/cUnix.mli b/lib/cUnix.mli
index f03719c3d2..c6bcf63475 100644
--- a/lib/cUnix.mli
+++ b/lib/cUnix.mli
@@ -46,7 +46,7 @@ val file_readable_p : string -> bool
     is called on each elements read on stdout or stderr. *)
 
 val run_command :
-  ?hook:(string->unit) -> string -> Unix.process_status * string
+  ?hook:(bytes->unit) -> string -> Unix.process_status * string
 
 (** [sys_command] launches program [prog] with arguments [args].
     It behaves like [Sys.command], except that we rely on
diff --git a/lib/pp_control.ml b/lib/pp_control.ml
index 890ffe0a18..ab8dc0798c 100644
--- a/lib/pp_control.ml
+++ b/lib/pp_control.ml
@@ -58,7 +58,7 @@ let with_fp chan out_function flush_function =
 (* Output on a channel ch *)
 
 let with_output_to ch =
-  let ft = with_fp ch (output ch) (fun () -> flush ch) in
+  let ft = with_fp ch (output_substring ch) (fun () -> flush ch) in
   set_gp ft deep_gp;
   ft
 
diff --git a/lib/util.ml b/lib/util.ml
index 9fb0d48ee8..0d2425f271 100644
--- a/lib/util.ml
+++ b/lib/util.ml
@@ -161,11 +161,11 @@ let iraise = Exninfo.iraise
 
 let open_utf8_file_in fname =
   let is_bom s =
-    Int.equal (Char.code s.[0]) 0xEF &&
-    Int.equal (Char.code s.[1]) 0xBB &&
-    Int.equal (Char.code s.[2]) 0xBF
+    Int.equal (Char.code (Bytes.get s 0)) 0xEF &&
+    Int.equal (Char.code (Bytes.get s 1)) 0xBB &&
+    Int.equal (Char.code (Bytes.get s 2)) 0xBF
   in
   let in_chan = open_in fname in
-  let s = "   " in
+  let s = Bytes.make 3 ' ' in
   if input in_chan s 0 3 < 3 || not (is_bom s) then seek_in in_chan 0;
   in_chan