public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
* [newlib-cygwin] Cygwin: Move post-dir unlink check
@ 2021-01-22 12:35 Corinna Vinschen
0 siblings, 0 replies; only message in thread
From: Corinna Vinschen @ 2021-01-22 12:35 UTC (permalink / raw)
To: cygwin-cvs
https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=0c0ff5dc2103988bda9eee2a97633a8b54bb476e
commit 0c0ff5dc2103988bda9eee2a97633a8b54bb476e
Author: Ben Wijen <ben@wijen.net>
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;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-22 12:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-22 12:35 [newlib-cygwin] Cygwin: Move post-dir unlink check Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).