From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21995 invoked by alias); 6 Feb 2019 20:31:53 -0000 Mailing-List: contact cygwin-cvs-help@cygwin.com; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-cvs-owner@cygwin.com Received: (qmail 21953 invoked by uid 9078); 6 Feb 2019 20:31:53 -0000 Date: Wed, 06 Feb 2019 20:31:00 -0000 Message-ID: <20190206203153.21951.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: unlink: allow fallback from POSIX to default method X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/master X-Git-Oldrev: 5628399c8470d3bbf6ca05b3d0f7f0366f1c16f8 X-Git-Newrev: 9fa22dba558f5e3efd0bb719049491edcd7b5e0b X-SW-Source: 2019-q1/txt/msg00136.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9fa22dba558f5e3efd0bb719049491edcd7b5e0b commit 9fa22dba558f5e3efd0bb719049491edcd7b5e0b Author: Corinna Vinschen Date: Wed Feb 6 21:17:35 2019 +0100 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 Diff: --- 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 62b9638..593c2a4 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