Skip to content

Support deleting symlinks in Lwt_io.with_temp_dir on Windows #886

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smorimoto merged 1 commit into from
Nov 7, 2021
Merged

Support deleting symlinks in Lwt_io.with_temp_dir on Windows #886

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGES
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
the behavior of Lwt_io.with_temp_dir following symlinks to
directories on Win32. (#883, Antonin Décimo)

* Support deleting symlinks on Windows during cleanup of Lwt_io.with_temp_dir (#886, Antonin Décimo)

* Lwt_react.S.l[2-6]_s used polymorphic equality which could cause errors when
handling functional values. (#893, Jérôme Vouillon)

Expand Down
15 changes: 10 additions & 5 deletions src/unix/lwt_io.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1509,11 +1509,16 @@ let rec delete_recursively directory =
Lwt.return ()
else
let path = Filename.concat directory entry in
Lwt_unix.lstat path >>= fun stat ->
if stat.Lwt_unix.st_kind = Lwt_unix.S_DIR then
delete_recursively path
else
unlink path
Lwt_unix.lstat path >>= fun {Lwt_unix.st_kind; _} ->
match st_kind with
| S_DIR -> delete_recursively path
| S_LNK when (Sys.win32 || Sys.cygwin) ->
Lwt_unix.stat path >>= fun {Lwt_unix.st_kind; _} ->
begin match st_kind with
| S_DIR -> Lwt_unix.rmdir path
| _ -> unlink path
end
| _ -> unlink path
end >>= fun () ->
Lwt_unix.rmdir directory

Expand Down