From ce9e7c2a842d7ec7734b58af64de9283de963e37 Mon Sep 17 00:00:00 2001
From: Emilio Jesus Gallego Arias
Date: Fri, 4 Dec 2015 19:25:08 +0100
Subject: Replace Unix.readdir by Sys.readdir in dir cache.

This makes the function sightly more portable.
---
 lib/system.ml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'lib/system.ml')

diff --git a/lib/system.ml b/lib/system.ml
index 2e35a98f7f..91b2f5afaf 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -67,16 +67,8 @@ module StrSet = Set.Make(StrMod)
 let dirmap = ref StrMap.empty
 
 let make_dir_table dir =
-  let b = ref StrSet.empty in
-  let a = Unix.opendir dir in
-  (try
-    while true do
-      let s = Unix.readdir a in
-      if s.[0] != '.' then b := StrSet.add s !b
-    done
-  with
-  | End_of_file -> ());
-  Unix.closedir a; !b
+  let filter_dotfiles s f = if f.[0] = '.' then s else StrSet.add f s in
+  Array.fold_left filter_dotfiles StrSet.empty (Sys.readdir dir)
 
 let exists_in_dir_respecting_case dir bf =
   let contents, cached =
-- 
cgit v1.2.3


From 9d45d45f3a8718581a001af4576ca87feb741073 Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond
Date: Wed, 9 Dec 2015 14:56:17 +0100
Subject: Remove remaining occurrences of Unix.readdir.

---
 lib/system.ml | 30 ++++++++++--------------------
 1 file changed, 10 insertions(+), 20 deletions(-)

(limited to 'lib/system.ml')

diff --git a/lib/system.ml b/lib/system.ml
index 91b2f5afaf..f860bd2f7e 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -11,12 +11,11 @@
 open Pp
 open Errors
 open Util
-open Unix
 
 (* All subdirectories, recursively *)
 
 let exists_dir dir =
-  try let _ = closedir (opendir dir) in true with Unix_error _ -> false
+  try Sys.is_directory dir with Sys_error _ -> false
 
 let skipped_dirnames = ref ["CVS"; "_darcs"]
 
@@ -31,24 +30,15 @@ let all_subdirs ~unix_path:root =
   let l = ref [] in
   let add f rel = l := (f, rel) :: !l in
   let rec traverse dir rel =
-    let dirh = opendir dir in
-    try
-      while true do
-	let f = readdir dirh in
-	if ok_dirname f then
-	  let file = Filename.concat dir f in
-	  try
-            begin match (stat file).st_kind with
-	    | S_DIR ->
-	      let newrel = rel @ [f] in
-	      add file newrel;
-	      traverse file newrel
-            | _ -> ()
-            end
-	  with Unix_error (e,s1,s2) -> ()
-      done
-    with End_of_file ->
-      closedir dirh
+    Array.iter (fun f ->
+      if ok_dirname f then
+	let file = Filename.concat dir f in
+        if Sys.is_directory file then begin
+          let newrel = rel @ [f] in
+	  add file newrel;
+	  traverse file newrel
+        end)
+      (Sys.readdir dir)
   in
   if exists_dir root then traverse root [];
   List.rev !l
-- 
cgit v1.2.3


From 20e1829ad3de42dd322af972c6f9a585f40738ef Mon Sep 17 00:00:00 2001
From: Hugo Herbelin
Date: Thu, 10 Dec 2015 16:40:38 +0100
Subject: Fixing compilation with OCaml 3.12 after commit 9d45d45f3a87 on
 removing "open Unix" from lib/system.ml.

---
 lib/system.ml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/system.ml')

diff --git a/lib/system.ml b/lib/system.ml
index f860bd2f7e..a902229609 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -262,7 +262,7 @@ type time = float * float * float
 
 let get_time () =
   let t = Unix.times ()  in
-  (Unix.gettimeofday(), t.tms_utime, t.tms_stime)
+  (Unix.gettimeofday(), t.Unix.tms_utime, t.Unix.tms_stime)
 
 (* Keep only 3 significant digits *)
 let round f = (floor (f *. 1e3)) *. 1e-3
-- 
cgit v1.2.3