From 9fa22dba558f5e3efd0bb719049491edcd7b5e0b Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 6 Feb 2019 21:17:35 +0100 Subject: [PATCH] Cygwin: unlink: allow fallback from POSIX to default method Trying to delete in-use executables and DLLs using FILE_DISPOSITION_POSIX_SEMANTICS returns STATUS_CANNOT_DELETE. Fall back to the former method if that error occurs to allow unlinking these files. Signed-off-by: Corinna Vinschen --- winsup/cygwin/syscalls.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 62b963844..593c2a4af 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -733,7 +733,11 @@ unlink_nt (path_conv &pc) if (pc.file_attributes () & FILE_ATTRIBUTE_READONLY) NtSetAttributesFile (fh, pc.file_attributes ()); NtClose (fh); - goto out; + /* Trying to delete in-use executables and DLLs using + FILE_DISPOSITION_POSIX_SEMANTICS returns STATUS_CANNOT_DELETE. + Fall back to the default method. */ + if (status != STATUS_CANNOT_DELETE) + goto out; } /* If the R/O attribute is set, we have to open the file with -- 2.43.5