aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmilio Jesus Gallego Arias2019-08-08 22:02:46 +0200
committerEmilio Jesus Gallego Arias2019-08-08 22:02:46 +0200
commit0146ca2b11a255cbfe2868923b80376a61cc05de (patch)
treeae7a1fcc3fd55b69574dc51561e6dc369654e781
parent9fdeb13166af29bfc6ec1e1930f1932ddc9f1cd4 (diff)
parent86e8deed878251e74534393a7b37a1471f7fa079 (diff)
Merge PR #10639: map directory read error to empty directory
Reviewed-by: ejgallego
-rw-r--r--lib/system.ml8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/system.ml b/lib/system.ml
index 46b358f825..b1a9efccfc 100644
--- a/lib/system.ml
+++ b/lib/system.ml
@@ -53,8 +53,14 @@ module StrSet = Set.Make(StrMod)
let dirmap = ref StrMap.empty
let make_dir_table dir =
+ let entries =
+ try
+ Sys.readdir dir
+ with Sys_error _ ->
+ warn_cannot_open_dir dir;
+ [||] in
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 entries
(** Don't trust in interactive mode (the default) *)
let trust_file_cache = ref false