Move fchmodat to unix

Author: patricoferris

lib_eio/unix/eio_unix.mli

@@ -107,6 +107,8 @@ module Private : sig
 
   val read_link : Fd.t option -> string -> string
   val read_link_unix : Unix.file_descr option -> string -> string
+  val chmod : Fd.t -> string -> flags:int -> mode:int -> unit
+  val chmod_unix : Unix.file_descr -> string -> flags:int -> mode:int -> unit
 end
 
 module Pi = Pi

lib_eio/unix/primitives.h

@@ -9,4 +9,5 @@ CAMLprim value eio_unix_fork_fchdir(value);
 CAMLprim value eio_unix_fork_dups(value);
 CAMLprim value eio_unix_cap_enter(value);
 CAMLprim value eio_unix_readlinkat(value, value, value);
+CAMLprim value eio_unix_fchmodat(value, value, value, value);
 CAMLprim value eio_unix_is_blocking(value);

lib_eio/unix/private.ml

@@ -33,3 +33,10 @@ let read_link_unix fd path =
     aux 1024
 
 let read_link fd path = Fd.use_exn_opt "readlink" fd (fun fd -> read_link_unix fd path)
+
+external eio_fchmodat : Unix.file_descr -> string -> int -> int -> unit = "eio_unix_fchmodat"
+
+let chmod_unix fd path ~flags ~mode = eio_fchmodat fd path mode flags
+
+let chmod fd path ~flags ~mode =
+  Fd.use_exn "chmod" fd (fun fd -> chmod_unix ~flags ~mode fd path)

lib_eio/unix/stubs.c

@@ -3,6 +3,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <errno.h>
+#include <sys/stat.h>
 
 #include <caml/mlvalues.h>
 #include <caml/unixsupport.h>
@@ -52,3 +53,17 @@ CAMLprim value eio_unix_readlinkat(value v_fd, value v_path, value v_cs) {
   CAMLreturn(Val_int(ret));
   #endif
 }
+
+CAMLprim value eio_unix_fchmodat(value v_fd, value v_path, value v_mode, value v_flags) {
+  CAMLparam1(v_path);
+  char *path;
+  int ret;
+  caml_unix_check_path(v_path, "fchmodat");
+  path = caml_stat_strdup(String_val(v_path));
+  caml_enter_blocking_section();
+  ret = fchmodat(Int_val(v_fd), path, Int_val(v_mode), Int_val(v_flags));
+  caml_leave_blocking_section();
+  caml_stat_free_preserving_errno(path);
+  if (ret == -1) uerror("fchmodat", v_path);
+  CAMLreturn(Val_unit);
+}

lib_eio_posix/eio_posix_stubs.c

@@ -405,20 +405,6 @@ CAMLprim value caml_eio_posix_symlinkat(value v_old_path, value v_new_fd, value
   CAMLreturn(Val_unit);
 }
 
-CAMLprim value caml_eio_posix_fchmodat(value v_fd, value v_path, value v_mode, value v_flags) {
-  CAMLparam1(v_path);
-  char *path;
-  int ret;
-  caml_unix_check_path(v_path, "fchmodat");
-  path = caml_stat_strdup(String_val(v_path));
-  caml_enter_blocking_section();
-  ret = fchmodat(Int_val(v_fd), path, Int_val(v_mode), Int_val(v_flags));
-  caml_leave_blocking_section();
-  caml_stat_free_preserving_errno(path);
-  if (ret == -1) uerror("fchmodat", v_path);
-  CAMLreturn(Val_unit);
-}
-
 CAMLprim value caml_eio_posix_spawn(value v_errors, value v_actions) {
   CAMLparam1(v_actions);
   pid_t child_pid;

lib_eio_posix/low_level.ml

@@ -423,14 +423,12 @@ let symlink ~link_to new_dir new_path =
   let new_dir = Option.value new_dir ~default:at_fdcwd in
   eio_symlinkat link_to new_dir new_path
 
-external eio_fchmodat : Unix.file_descr -> string -> int -> int -> unit = "caml_eio_posix_fchmodat"
-
 let chmod ~follow ~mode dir path =
   in_worker_thread "chmod" @@ fun () ->
+  let flags = if follow then 0 else Config.at_symlink_nofollow in
   Resolve.with_parent "chmod" dir path @@ fun dir path ->
   let new_dir = Option.value dir ~default:at_fdcwd in
-  let flags = if follow then 0 else Config.at_symlink_nofollow in
-  eio_fchmodat new_dir path mode flags
+  Eio_unix.Private.chmod_unix new_dir path ~mode ~flags
 
 let read_link dirfd path =
   in_worker_thread "read_link" @@ fun () ->