From ff488124ff455b4fe3271282b1585adea74eb84d Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 11 Mar 2008 11:12:09 +0000 Subject: [PATCH] * syscalls.cc (sync): Use MAX_PATH rather than CYG_MAX_PATH. --- winsup/cygwin/ChangeLog | 4 ++++ winsup/cygwin/syscalls.cc | 15 ++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 6ee0b2cfe..f5987d950 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,7 @@ +2008-03-11 Corinna Vinschen + + * syscalls.cc (sync): Use MAX_PATH rather than CYG_MAX_PATH. + 2008-03-10 Corinna Vinschen * fhandler.h (class fhandler_console): Add write_buf as pointer to diff --git a/winsup/cygwin/syscalls.cc b/winsup/cygwin/syscalls.cc index 61786601d..e421edd9c 100644 --- a/winsup/cygwin/syscalls.cc +++ b/winsup/cygwin/syscalls.cc @@ -1272,19 +1272,20 @@ sync_worker (const char *vol) extern "C" void sync () { - char vol[CYG_MAX_PATH]; + /* Per MSDN, 50 bytes should be enough here. */ + char vol[MAX_PATH]; if (wincap.has_guid_volumes ()) /* Win2k and newer */ { - char a_drive[CYG_MAX_PATH] = {0}; - char b_drive[CYG_MAX_PATH] = {0}; + char a_drive[MAX_PATH] = {0}; + char b_drive[MAX_PATH] = {0}; if (is_floppy ("A:")) - GetVolumeNameForVolumeMountPointA ("A:\\", a_drive, CYG_MAX_PATH); + GetVolumeNameForVolumeMountPointA ("A:\\", a_drive, MAX_PATH); if (is_floppy ("B:")) - GetVolumeNameForVolumeMountPointA ("B:\\", b_drive, CYG_MAX_PATH); + GetVolumeNameForVolumeMountPointA ("B:\\", b_drive, MAX_PATH); - HANDLE sh = FindFirstVolumeA (vol, CYG_MAX_PATH); + HANDLE sh = FindFirstVolumeA (vol, MAX_PATH); if (sh != INVALID_HANDLE_VALUE) { do @@ -1302,7 +1303,7 @@ sync () vol[strlen (vol) - 1] = '\0'; sync_worker (vol); } - while (FindNextVolumeA (sh, vol, CYG_MAX_PATH)); + while (FindNextVolumeA (sh, vol, MAX_PATH)); FindVolumeClose (sh); } } -- 2.43.5