Fixing paths passed to eio

darrenldl · Jun 29, 2024 · 1aee502 · 1aee502
1 parent c2667df
commit 1aee502
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/bin/BLAKE2B.ml b/bin/BLAKE2B.ml
@@ -6,7 +6,7 @@ let hash_of_file ~env ~path =
   let fs = Eio.Stdenv.fs env in
   let ctx = ref B.empty in
   try
-    Eio.Path.(with_open_in (fs / path))
+    Eio.Path.(with_open_in (fs / File_utils.fix_path_for_eio path))
       (fun flow ->
          match
            Eio.Buf_read.parse ~max_size:Params.hash_chunk_size

diff --git a/bin/document.ml b/bin/document.ml
@@ -122,8 +122,13 @@ let save_index ~env ~hash index : (unit, string) result =
   | Some cache_dir -> (
       let fs = Eio.Stdenv.fs env in
       let path =
-        Eio.Path.(fs /
-                  Filename.concat cache_dir (Fmt.str "%s%s" hash Params.index_file_ext))
+        Eio.Path.(
+          fs /
+          File_utils.fix_path_for_eio
+            (Filename.concat
+               cache_dir
+               (Fmt.str "%s%s" hash Params.index_file_ext))
+        )
       in
       let json = Index.to_json index in
       try
@@ -142,6 +147,7 @@ let find_index ~env ~hash : Index.t option =
       try
         let path_str =
           Filename.concat cache_dir (Fmt.str "%s.index" hash)
+          |> File_utils.fix_path_for_eio
         in
         let path =
           Eio.Path.(fs / path_str)

diff --git a/bin/file_utils.ml b/bin/file_utils.ml
@@ -1,6 +1,13 @@
 open Misc_utils
 open Debug_utils
 
+let fix_path_for_eio (s : string) =
+  if Sys.win32 then (
+    CCString.replace ~sub:"\\" ~by:"/" s
+  ) else (
+    s
+  )
+
 let remove_cwd_from_path (s : string) =
   let pre = Params.cwd_with_trailing_sep in
   match CCString.chop_prefix ~pre s with