From 4b5af0d6e9ec1343a2c3ff9f856a019fa93c3606 Mon Sep 17 00:00:00 2001 From: Hugo Herbelin Date: Fri, 15 May 2015 17:42:16 +0200 Subject: On MacOS X, ensuring that files found in the file system have the expected lowercase/uppercase spelling (based on a patch by Pierre B.). This should fix #2554 (and see also discussion on coq-club, May 2015). --- lib/system.ml | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'lib/system.ml') diff --git a/lib/system.ml b/lib/system.ml index d1cdd8efc..6364035e1 100644 --- a/lib/system.ml +++ b/lib/system.ml @@ -53,6 +53,19 @@ let all_subdirs ~unix_path:root = if exists_dir root then traverse root []; List.rev !l +let file_really_exists f = + if Coq_config.arch = "Darwin" then + (* ensure that the file exists with expected case on the + case-insensitive but case-preserving default MacOS file system *) + let rec aux f = + Printf.eprintf ".%!"; + let bf = Filename.basename f in + let df = Filename.dirname f in + String.equal df "." || String.equal df "/" || + aux df && Array.exists (String.equal bf) (Sys.readdir df) + in aux f + else Sys.file_exists f + let rec search paths test = match paths with | [] -> [] -- cgit v1.2.3 From 69941d4e195650bf59285b897c14d6287defea0f Mon Sep 17 00:00:00 2001 From: Hugo Herbelin Date: Wed, 20 May 2015 14:36:41 +0200 Subject: Continuing incomplete 4b5af0d6e9ec1 (on MacOS X, ensuring that files found in the file system have the expected lowercase/uppercase spelling) --- lib/envars.ml | 19 ++++++++++++++++--- lib/system.ml | 7 +++---- lib/system.mli | 2 ++ 3 files changed, 21 insertions(+), 7 deletions(-) (limited to 'lib/system.ml') diff --git a/lib/envars.ml b/lib/envars.ml index b0eed8386..ac0b6f722 100644 --- a/lib/envars.ml +++ b/lib/envars.ml @@ -39,12 +39,25 @@ let path_to_list p = let user_path () = path_to_list (Sys.getenv "PATH") (* may raise Not_found *) + (* Duplicated from system.ml to minimize dependencies *) +let file_exists_respecting_case f = + if Coq_config.arch = "Darwin" then + (* ensure that the file exists with expected case on the + case-insensitive but case-preserving default MacOS file system *) + let rec aux f = + let bf = Filename.basename f in + let df = Filename.dirname f in + String.equal df "." || String.equal df "/" || + aux df && Array.exists (String.equal bf) (Sys.readdir df) + in aux f + else Sys.file_exists f + let rec which l f = match l with | [] -> raise Not_found | p :: tl -> - if Sys.file_exists (p / f) then + if file_exists_respecting_case (p / f) then p else which tl f @@ -102,7 +115,7 @@ let _ = If the check fails, then [oth ()] is evaluated. *) let check_file_else ~dir ~file oth = let path = if Coq_config.local then coqroot else coqroot / dir in - if Sys.file_exists (path / file) then path else oth () + if file_exists_respecting_case (path / file) then path else oth () let guess_coqlib fail = let prelude = "theories/Init/Prelude.vo" in @@ -134,7 +147,7 @@ let coqpath = let coqpath = getenv_else "COQPATH" (fun () -> "") in let make_search_path path = let paths = path_to_list path in - let valid_paths = List.filter Sys.file_exists paths in + let valid_paths = List.filter file_exists_respecting_case paths in List.rev valid_paths in make_search_path coqpath diff --git a/lib/system.ml b/lib/system.ml index 6364035e1..1a67120b6 100644 --- a/lib/system.ml +++ b/lib/system.ml @@ -53,12 +53,11 @@ let all_subdirs ~unix_path:root = if exists_dir root then traverse root []; List.rev !l -let file_really_exists f = +let file_exists_respecting_case f = if Coq_config.arch = "Darwin" then (* ensure that the file exists with expected case on the case-insensitive but case-preserving default MacOS file system *) let rec aux f = - Printf.eprintf ".%!"; let bf = Filename.basename f in let df = Filename.dirname f in String.equal df "." || String.equal df "/" || @@ -90,7 +89,7 @@ let where_in_path ?(warn=true) path filename = in check_and_warn (search path (fun lpe -> let f = Filename.concat lpe filename in - if Sys.file_exists f then [lpe,f] else [])) + if file_exists_respecting_case f then [lpe,f] else [])) let where_in_path_rex path rex = search path (fun lpe -> @@ -106,7 +105,7 @@ let where_in_path_rex path rex = let find_file_in_path ?(warn=true) paths filename = if not (Filename.is_implicit filename) then - if Sys.file_exists filename then + if file_exists_respecting_case filename then let root = Filename.dirname filename in root, filename else diff --git a/lib/system.mli b/lib/system.mli index a3d66d577..051e92f16 100644 --- a/lib/system.mli +++ b/lib/system.mli @@ -29,6 +29,8 @@ val exists_dir : string -> bool val find_file_in_path : ?warn:bool -> CUnix.load_path -> string -> CUnix.physical_path * string +val file_exists_respecting_case : string -> bool + (** {6 I/O functions } *) (** Generic input and output functions, parameterized by a magic number and a suffix. The intern functions raise the exception [Bad_magic_number] -- cgit v1.2.3 From e7043eec55085f4101bfb126d8829de6f6086c5a Mon Sep 17 00:00:00 2001 From: Hugo Herbelin Date: Fri, 22 May 2015 08:50:36 +0200 Subject: Continuing 4b5af0d6e9 and 69941d4e19 about filename case check on MacOS X. Thanks to Vadim Zaliva for testing. --- lib/system.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/system.ml') diff --git a/lib/system.ml b/lib/system.ml index 1a67120b6..27e21204c 100644 --- a/lib/system.ml +++ b/lib/system.ml @@ -60,8 +60,8 @@ let file_exists_respecting_case f = let rec aux f = let bf = Filename.basename f in let df = Filename.dirname f in - String.equal df "." || String.equal df "/" || - aux df && Array.exists (String.equal bf) (Sys.readdir df) + (String.equal df "." || String.equal df "/" || aux df) + && Array.exists (String.equal bf) (Sys.readdir df) in aux f else Sys.file_exists f -- cgit v1.2.3