eio_windows: improve openat error handling

talex5 · talex5 · commit 2cd09925d028 · 2024-06-19T11:45:19.000+01:00
diff --git a/lib_eio_windows/eio_windows_stubs.c b/lib_eio_windows/eio_windows_stubs.c
@@ -237,7 +237,7 @@ CAMLprim value caml_eio_windows_unlinkat(value v_dirfd, value v_pathname, value
 
   if (!NT_SUCCESS(r)) {
     caml_win32_maperr(RtlNtStatusToDosError(r));
-    uerror("openat", Nothing);
+    uerror("openat", v_pathname);
   }
 
   // Now close the file to delete it
diff --git a/lib_eio_windows/fs.ml b/lib_eio_windows/fs.ml
@@ -82,7 +82,7 @@ end = struct
         let dir = resolve t dir in
         Switch.run @@ fun sw ->
         let open Low_level in
-        let dirfd = Low_level.openat ~sw ~nofollow:true dir Flags.Open.(generic_read + synchronise) Flags.Disposition.(open_if) Flags.Create.(directory) in
+        let dirfd = Err.run (Low_level.openat ~sw ~nofollow:true dir Flags.Open.(generic_read + synchronise) Flags.Disposition.(open_if)) Flags.Create.(directory) in
         fn (Some dirfd) leaf
       )
     ) else fn None path

Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ CAMLprim value caml_eio_windows_unlinkat(value v_dirfd, value v_pathname, value`
`237`	`237`
`238`	`238`	`if (!NT_SUCCESS(r)) {`
`239`	`239`	`caml_win32_maperr(RtlNtStatusToDosError(r));`
`240`		`- uerror("openat", Nothing);`
	`240`	`+ uerror("openat", v_pathname);`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`// Now close the file to delete it`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ end = struct`
`82`	`82`	`let dir = resolve t dir in`
`83`	`83`	`Switch.run @@ fun sw ->`
`84`	`84`	`let open Low_level in`
`85`		`- let dirfd = Low_level.openat ~sw ~nofollow:true dir Flags.Open.(generic_read + synchronise) Flags.Disposition.(open_if) Flags.Create.(directory) in`
	`85`	`+ let dirfd = Err.run (Low_level.openat ~sw ~nofollow:true dir Flags.Open.(generic_read + synchronise) Flags.Disposition.(open_if)) Flags.Create.(directory) in`
`86`	`86`	`fn (Some dirfd) leaf`
`87`	`87`	`)`
`88`	`88`	`) else fn None path`