From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id 93C0F382D83C; Fri, 22 Jan 2021 12:35:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 93C0F382D83C 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: Move post-dir unlink check X-Act-Checkin: newlib-cygwin X-Git-Author: Ben Wijen X-Git-Refname: refs/heads/master X-Git-Oldrev: a53333458146089ab650fda33a7a7097f7ad0ab3 X-Git-Newrev: 0c0ff5dc2103988bda9eee2a97633a8b54bb476e Message-Id: <20210122123547.93C0F382D83C@sourceware.org> Date: Fri, 22 Jan 2021 12:35:47 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2021 12:35:47 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0c0ff5dc2103988bda9eee2a97633a8b54bb476e commit 0c0ff5dc2103988bda9eee2a97633a8b54bb476e Author: Ben Wijen Date: Wed Jan 20 17:10:51 2021 +0100 Cygwin: Move post-dir unlink check Move post-dir unlink check from fhandler_disk_file::rmdir to _unlink_nt_post_dir_check If a directory is not removed through fhandler_disk_file::rmdir we can now make sure the post dir check is performed. Diff: --- winsup/cygwin/fhandler_disk_file.cc | 20 -------------------- winsup/cygwin/syscalls.cc | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index 885b59161..07f9c513a 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -1852,26 +1852,6 @@ fhandler_disk_file::rmdir () NTSTATUS status = unlink_nt (pc); - /* Check for existence of remote dirs after trying to delete them. - Two reasons: - - Sometimes SMB indicates failure when it really succeeds. - - Removing a directory on a Samba drive using an old Samba version - sometimes doesn't return an error, if the directory can't be removed - because it's not empty. */ - if (isremote ()) - { - OBJECT_ATTRIBUTES attr; - FILE_BASIC_INFORMATION fbi; - NTSTATUS q_status; - - q_status = NtQueryAttributesFile (pc.get_object_attr (attr, sec_none_nih), - &fbi); - if (!NT_SUCCESS (status) && q_status == STATUS_OBJECT_NAME_NOT_FOUND) - status = STATUS_SUCCESS; - else if (pc.fs_is_samba () - && NT_SUCCESS (status) && NT_SUCCESS (q_status)) - status = STATUS_DIRECTORY_NOT_EMPTY; - } if (!NT_SUCCESS (status)) { __seterrno_from_nt_status (status); diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 4742c6653..7044ea903 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -670,6 +670,30 @@ check_dir_not_empty (HANDLE dir, path_conv &pc) return STATUS_SUCCESS; } +static inline NTSTATUS +_unlink_nt_post_dir_check (NTSTATUS status, POBJECT_ATTRIBUTES attr, const path_conv &pc) +{ + /* Check for existence of remote dirs after trying to delete them. + Two reasons: + - Sometimes SMB indicates failure when it really succeeds. + - Removing a directory on a Samba drive using an old Samba version + sometimes doesn't return an error, if the directory can't be removed + because it's not empty. */ + if (pc.isremote ()) + { + FILE_BASIC_INFORMATION fbi; + NTSTATUS q_status; + + q_status = NtQueryAttributesFile (attr, &fbi); + if (!NT_SUCCESS (status) && q_status == STATUS_OBJECT_NAME_NOT_FOUND) + status = STATUS_SUCCESS; + else if (pc.fs_is_samba () + && NT_SUCCESS (status) && NT_SUCCESS (q_status)) + status = STATUS_DIRECTORY_NOT_EMPTY; + } + return status; +} + static NTSTATUS _unlink_nt (path_conv &pc, bool shareable) { @@ -1059,6 +1083,10 @@ out: /* Stop transaction if we started one. */ if (trans) stop_transaction (status, old_trans, trans); + + if (pc.isdir ()) + status = _unlink_nt_post_dir_check (status, &attr, pc); + syscall_printf ("%S, return status = %y", pc.get_nt_native_path (), status); return status; }