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

* path.cc (fs_info::update): Correctly handle the volume root directory.

Browse Source
This commit is contained in:
Corinna Vinschen 2007-08-14 15:54:45 +00:00
parent 4a971ce403
commit cb8e4b58f5
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,7 @@
2007-08-14 Corinna Vinschen <corinna@vinschen.de>
* path.cc (fs_info::update): Correctly handle the volume root directory.
2007-08-14 Corinna Vinschen <corinna@vinschen.de> 2007-08-14 Corinna Vinschen <corinna@vinschen.de>
* fhandler.h (fhandler_base::pc): Make public. * fhandler.h (fhandler_base::pc): Make public.

7
winsup/cygwin/path.cc
View File

@ -393,17 +393,20 @@ fs_info::update (PUNICODE_STRING upath, bool exists)
if (exists) if (exists)
status = NtOpenFile (&vol, READ_CONTROL, &attr, &io, FILE_SHARE_VALID_FLAGS, status = NtOpenFile (&vol, READ_CONTROL, &attr, &io, FILE_SHARE_VALID_FLAGS,
FILE_OPEN_FOR_BACKUP_INTENT); FILE_OPEN_FOR_BACKUP_INTENT);
while (!NT_SUCCESS (status) && attr.ObjectName->Length > 6 * sizeof (WCHAR)) while (!NT_SUCCESS (status)
&& (attr.ObjectName->Length > 7 * sizeof (WCHAR)
|| status == STATUS_NO_MEDIA_IN_DEVICE))
{ {
UNICODE_STRING dir; UNICODE_STRING dir;
RtlSplitUnicodePath (attr.ObjectName, &dir, NULL); RtlSplitUnicodePath (attr.ObjectName, &dir, NULL);
dir.Length -= sizeof (WCHAR);
attr.ObjectName = &dir; attr.ObjectName = &dir;
if (status == STATUS_NO_MEDIA_IN_DEVICE) if (status == STATUS_NO_MEDIA_IN_DEVICE)
{ {
no_media = true; no_media = true;
dir.Length = 6 * sizeof (WCHAR); dir.Length = 6 * sizeof (WCHAR);
} }
else if (dir.Length > 7 * sizeof (WCHAR))
dir.Length -= sizeof (WCHAR);
status = NtOpenFile (&vol, READ_CONTROL, &attr, &io, status = NtOpenFile (&vol, READ_CONTROL, &attr, &io,
FILE_SHARE_VALID_FLAGS, FILE_OPEN_FOR_BACKUP_INTENT); FILE_SHARE_VALID_FLAGS, FILE_OPEN_FOR_BACKUP_INTENT);
} }