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

Revert previous patch.

Browse Source 
* autoload.cc (GetVolumePathNamesForVolumeNameA): Remove.
	* autoload.cc (GetVolumeNameForVolumeMountPointA): Add.
	* syscalls.cc (sync): Rewrite guid case to skip floppies also on
	Windows 2000.
This commit is contained in:
Corinna Vinschen
2005-04-11 21:54:54 +00:00
parent 48d304ef5a
commit 98e103aac9
5 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
winsup/cygwin/syscalls.cc
View File

@@ -939,28 +939,28 @@ sync ()
{
char vol[CYG_MAX_PATH];
if (wincap.has_get_volume_pathnames ()) /* Win2k and newer */
if (wincap.has_guid_volumes ()) /* Win2k and newer */
{
char a_drive[CYG_MAX_PATH] = {0};
char b_drive[CYG_MAX_PATH] = {0};
if (is_floppy ("A:"))
GetVolumeNameForVolumeMountPointA ("A:\\", a_drive, CYG_MAX_PATH);
if (is_floppy ("B:"))
GetVolumeNameForVolumeMountPointA ("B:\\", a_drive, CYG_MAX_PATH);
HANDLE sh = FindFirstVolumeA (vol, CYG_MAX_PATH);
if (sh != INVALID_HANDLE_VALUE)
{
do
{
char pvol[CYG_MAX_PATH];
DWORD len;
if (GetVolumePathNamesForVolumeNameA (vol, pvol, CYG_MAX_PATH,
&len))
debug_printf ("Try volume %s (GUID: %s)", pvol, vol);
else
debug_printf ("Try volume %s", vol);
debug_printf ("Try volume %s", vol);
/* Check pvol for being a floppy on A: or B:. Skip them. */
if (strncasematch (pvol, "A:", 2)
|| strncasematch (pvol, "B:", 2))
/* Check vol for being a floppy on A: or B:. Skip them. */
if (strcasematch (vol, a_drive) || strcasematch (vol, b_drive))
{
pvol[2] = '\0';
if (is_floppy (pvol))
continue;
debug_printf ("Is floppy, don't sync");
continue;
}
/* Eliminate trailing backslash. */