JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cygwin: unlink: fix "final trick" overwrite method on remote drives

Browse Source 
The "final trick" code in try_to_bin accidentally never worked on
remote drives because it relies on rootdir.  Which isn't set for
remote unlinks.  The code now creates a full path for remote files.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2017-10-18 16:21:12 +02:00
parent 3dda58f157
commit e6c79e7a2a
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
winsup/cygwin/syscalls.cc
View File

@@ -542,8 +542,22 @@ try_to_bin (path_conv &pc, HANDLE &fh, ACCESS_MASK access, ULONG flags)
delete-on-close on the original file succeeds. There are still delete-on-close on the original file succeeds. There are still
cases in which this fails, for instance, when trying to delete a cases in which this fails, for instance, when trying to delete a
hardlink to a DLL used by the unlinking application itself. */ hardlink to a DLL used by the unlinking application itself. */
RtlAppendUnicodeToString (&recycler, L"X"); if (pc.isremote ())
InitializeObjectAttributes (&attr, &recycler, 0, rootdir, NULL); {
/* In the remote case we need the full path, but recycler is only
a relative path. Convert to absolute path. */
RtlInitEmptyUnicodeString (&fname, (PCWSTR) tp.w_get (),
(NT_MAX_PATH - 1) * sizeof (WCHAR));
RtlCopyUnicodeString (&fname, pc.get_nt_native_path ());
RtlSplitUnicodePath (&fname, &fname, NULL);
/* Reset max length, overwritten by RtlSplitUnicodePath. */
fname.MaximumLength = (NT_MAX_PATH - 1) * sizeof (WCHAR); /* reset */
RtlAppendUnicodeStringToString (&fname, &recycler);
}
else
fname = recycler;
RtlAppendUnicodeToString (&fname, L"X");
InitializeObjectAttributes (&attr, &fname, 0, rootdir, NULL);
status = NtCreateFile (&tmp_fh, DELETE, &attr, &io, NULL, status = NtCreateFile (&tmp_fh, DELETE, &attr, &io, NULL,
FILE_ATTRIBUTE_NORMAL, 0, FILE_SUPERSEDE, FILE_ATTRIBUTE_NORMAL, 0, FILE_SUPERSEDE,
FILE_NON_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE, FILE_NON_DIRECTORY_FILE | FILE_DELETE_ON_CLOSE,