mkdir, unlink and rmdir

Author: patricoferris

lib_eio_windows/eio_windows_stubs.c

@@ -149,11 +149,6 @@ CAMLprim value caml_eio_windows_openat(value v_dirfd, value v_pathname, value v_
   CAMLreturn(caml_win32_alloc_handle(h));
 }
 
-CAMLprim value caml_eio_windows_mkdirat(value v_fd, value v_path, value v_perm)
-{
-  uerror("mkdirat is not supported on windows yet", Nothing);
-}
-
 CAMLprim value caml_eio_windows_unlinkat(value v_dirfd, value v_pathname, value v_dir)
 {
   CAMLparam2(v_dirfd, v_pathname);

lib_eio_windows/low_level.ml

@@ -207,12 +207,10 @@ let openat ?dirfd ~sw path flags dis create =
   in_worker_thread (fun () -> eio_openat dirfd path Flags.Open.(flags + cloexec (* + nonblock *)) dis create)
   |> Fd.of_unix ~sw ~blocking:false ~close_unix:true
 
-external eio_mkdirat : Unix.file_descr option -> string -> Unix.file_perm -> unit = "caml_eio_windows_mkdirat"
-
-let mkdir ?dirfd ~mode path =
-  with_dirfd "mkdirat" dirfd @@ fun dirfd ->
-  in_worker_thread @@ fun () ->
-  eio_mkdirat dirfd path mode
+let mkdir ?dirfd ~mode:_ path =
+  Switch.run @@ fun sw ->
+  let _ : Fd.t = openat ?dirfd ~sw path Flags.Open.(generic_write + synchronise) Flags.Disposition.(create) Flags.Create.(directory) in
+  ()
 
 external eio_unlinkat : Unix.file_descr option -> string -> bool -> unit = "caml_eio_windows_unlinkat"
 

lib_eio_windows/test/test_fs.ml

@@ -10,37 +10,37 @@ let ( / ) = Path.( / )
 let try_read_file path =
   match Path.load path with
   | s -> traceln "read %a -> %S" Path.pp path s
-  | exception ex -> traceln "@[<h>%a@]" Eio.Exn.pp ex
+  | exception ex -> raise ex
 
 let try_write_file ~create ?append path content =
   match Path.save ~create ?append path content with
   | () -> traceln "write %a -> ok" Path.pp path
-  | exception ex -> traceln "@[<h>%a@]" Eio.Exn.pp ex
+  | exception ex -> raise ex
 
 let try_mkdir path =
   match Path.mkdir path ~perm:0o700 with
   | () -> traceln "mkdir %a -> ok" Path.pp path
-  | exception ex -> traceln "@[<h>%a@]" Eio.Exn.pp ex
+  | exception ex -> raise ex
 
 let try_rename p1 p2 =
   match Path.rename p1 p2 with
   | () -> traceln "rename %a to %a -> ok" Path.pp p1 Path.pp p2
-  | exception ex -> traceln "@[<h>%a@]" Eio.Exn.pp ex
+  | exception ex -> raise ex
 
 let try_read_dir path =
   match Path.read_dir path with
   | names -> traceln "read_dir %a -> %a" Path.pp path Fmt.Dump.(list string) names
-  | exception ex -> traceln "@[<h>%a@]" Eio.Exn.pp ex
+  | exception ex -> raise ex
 
 let try_unlink path =
   match Path.unlink path with
   | () -> traceln "unlink %a -> ok" Path.pp path
-  | exception ex -> traceln "@[<h>%a@]" Eio.Exn.pp ex
+  | exception ex -> raise ex
 
 let try_rmdir path =
   match Path.rmdir path with
   | () -> traceln "rmdir %a -> ok" Path.pp path
-  | exception ex -> traceln "@[<h>%a@]" Eio.Exn.pp ex
+  | exception ex -> raise ex
 
 let with_temp_file path fn =
  Fun.protect (fun () -> fn path) ~finally:(fun () -> Eio.Path.unlink path)
@@ -110,6 +110,91 @@ let test_append env () =
   Path.save ~create:`Never ~append:true test_file "2nd-write";
   Alcotest.(check string) "append" "1st-write-original2nd-write" (Path.load test_file)
 
+let test_mkdir env () =
+  let cwd = Eio.Stdenv.cwd env in
+  try_mkdir (cwd / "subdir");
+  try_mkdir (cwd / "subdir\\nested");
+  let test_file = cwd / "subdir\\nested\\test-file" in
+  Path.save ~create:(`Exclusive 0o600) test_file "data";
+  Alcotest.(check string) "mkdir" "data" (Path.load test_file);
+  Unix.unlink "subdir\\nested\\test-file";
+  Unix.rmdir "subdir\\nested";
+  Unix.rmdir "subdir"
+
+let test_symlink _env () =
+  (* TODO *)
+  ()
+
+let test_unlink env () =
+  let cwd = Eio.Stdenv.cwd env in
+  Path.save ~create:(`Exclusive 0o600) (cwd / "file") "data";
+  try_mkdir (cwd / "subdir");
+  Path.save ~create:(`Exclusive 0o600) (cwd / "subdir\\file2") "data2";
+  try_read_file (cwd / "file");
+  try_read_file (cwd / "subdir\\file2");
+  try_unlink (cwd / "file");
+  try_unlink (cwd / "subdir\\file2");
+  let () =
+    try 
+      try_read_file (cwd / "file");
+      failwith "file should not exist"
+    with Eio.Io (Eio.Fs.E (Not_found _), _) -> ()
+  in
+  let () =
+    try 
+      try_read_file (cwd / "subdir\\file2");
+      failwith "file should not exist"
+    with Eio.Io (Eio.Fs.E (Not_found _), _) -> ()
+  in
+  try_write_file ~create:(`Exclusive 0o600) (cwd / "subdir\\file2") "data2";
+  (* Supposed to use symlinks here. *)
+  try_unlink (cwd / "subdir\\file2");
+  let () =
+    try 
+      try_read_file (cwd / "subdir\\file2");
+      failwith "file should not exist"
+    with Eio.Io (Eio.Fs.E (Not_found _), _) -> ()
+  in
+  ()
+
+let try_failing_unlink env () =
+  let cwd = Eio.Stdenv.cwd env in
+  let () =
+    try 
+      try_unlink (cwd / "missing");
+      failwith "Expected not found!"
+    with Eio.Io (Eio.Fs.E (Not_found _), _) -> ()
+  in
+  let () =
+    try 
+      try_unlink (cwd / "..\\foo");
+      failwith "Expected permission denied!"
+    with Eio.Io (Eio.Fs.E (Permission_denied _), _) -> ()
+  in
+  ()
+
+let test_remove_dir env () =
+  let cwd = Eio.Stdenv.cwd env in
+  try_mkdir (cwd / "d1");
+  try_mkdir (cwd / "subdir\\d2");
+  try_read_dir (cwd / "d1");
+  try_read_dir (cwd / "subdir\\d2");
+  try_rmdir (cwd / "d1");
+  try_rmdir (cwd / "subdir\\d2");
+  let () =
+    try 
+      try_read_dir (cwd / "d1");
+      failwith "Expected not found"
+    with Eio.Io (Eio.Fs.E (Not_found _), _) -> ()
+  in 
+  let () =
+    try 
+      try_read_dir (cwd / "subdir\\d2");
+      failwith "Expected not found"
+    with Eio.Io (Eio.Fs.E (Not_found _), _) -> ()
+  in
+  ()
+
 let tests env = [
   "create-write-read", `Quick, test_create_and_read env;
   "cwd-abs-path", `Quick, test_cwd_no_access_abs env;
@@ -118,4 +203,9 @@ let tests env = [
   "create-trunc", `Quick, test_trunc env;
   "create-empty", `Quick, test_empty env;
   "append", `Quick, test_append env;
+  "mkdir", `Quick, test_mkdir env;
+  "symlinks", `Quick, test_symlink env;
+  "unlink", `Quick, test_unlink env;
+  "failing-unlink", `Quick, try_failing_unlink env;
+  "rmdir", `Quick, test_remove_dir env;
 ]