* cygpath.cc (get_device_name): Prefer the \\.\X: DOS device for
harddisks, if available.
This commit is contained in:
parent
46059af75c
commit
708bbfd08e
|
@ -1,3 +1,8 @@
|
|||
2010-08-26 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* cygpath.cc (get_device_name): Prefer the \\.\X: DOS device for
|
||||
harddisks, if available.
|
||||
|
||||
2010-08-21 Corinna Vinschen <corinna@vinschen.de>
|
||||
|
||||
* ldd.cc (report): Drop long pathname considerations which result in
|
||||
|
|
|
@ -233,10 +233,20 @@ get_device_name (char *path)
|
|||
ans.MaximumLength = len;
|
||||
ans.Buffer = ret + 4;
|
||||
RtlUnicodeStringToAnsiString (&ans, &odi->ObjectName, FALSE);
|
||||
/* Special case for local disks: It's most feasible if the
|
||||
DOS device name reflects the DOS drive, so we check for this
|
||||
explicitly and only return prematurely if so. */
|
||||
#define HARDDISK_PREFIX L"\\Device\\Harddisk"
|
||||
if (ntdev.Length < wcslen (HARDDISK_PREFIX)
|
||||
|| wcsncasecmp (ntdev.Buffer, HARDDISK_PREFIX, 8) != 0
|
||||
|| (odi->ObjectName.Length == 2 * sizeof (WCHAR)
|
||||
&& odi->ObjectName.Buffer[1] == L':'))
|
||||
{
|
||||
ZwClose (dir);
|
||||
goto out;
|
||||
}
|
||||
}
|
||||
}
|
||||
ZwClose (dir);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue