diff options
| author |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-03-18 15:16:24 +0100 |
|---|---|---|
| committer | Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-03-18 15:19:00 +0100 |
| commit | 16939df43a089ac30fec0fcf30a2f648d007cb60 (patch) | |
| tree | 98046b9b2f7671d27ac8e69702afa6b0e2a457ef /lib/system.ml | |
| parent | b4b98349d03c31227d0d86a6e3acda8c3cd5212c (diff) | |
| parent | 34c467a4e41e20a9bf1318d47fbc09da94c5ad97 (diff) | |
Merge branch 'v8.5'
Diffstat (limited to 'lib/system.ml')
| -rw-r--r-- | lib/system.ml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/system.ml b/lib/system.ml index 13cfad4ae..10ef8580b 100644 --- a/lib/system.ml +++ b/lib/system.ml @@ -63,8 +63,10 @@ let apply_subdir f path name = | Unix.S_REG -> f (FileRegular name) | _ -> () +let readdir dir = try Sys.readdir dir with any -> [||] + let process_directory f path = - Array.iter (apply_subdir f path) (Sys.readdir path) + Array.iter (apply_subdir f path) (readdir path) let process_subdirectories f path = let f = function FileDir (path,base) -> f path base | FileRegular _ -> () in @@ -106,7 +108,7 @@ let dirmap = ref StrMap.empty let make_dir_table dir = 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) + Array.fold_left filter_dotfiles StrSet.empty (readdir dir) let exists_in_dir_respecting_case dir bf = let cache_dir dir = |