vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Workaround cygwin bug when using \\?\Volume{GUID} syntax.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-14 23:28:34 +01:00
parent 6d3cfe5063
commit 38933cee85
2 changed files with 47 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>
Workaround cygwin bug when using \\?\Volume{GUID} syntax.
2013-12-14 Vladimir Serbinenko <phcoder@gmail.com>
Do not use TCHAR string functions as they are not available on cygwin.

57
grub-core/osdep/windows/hostdisk.c
View file

@ -97,12 +97,54 @@ grub_util_tchar_to_utf8 (LPCTSTR in)
#error "Unsupported TCHAR size"
#endif
LPTSTR
grub_util_get_windows_path_real (const char *path)
{
LPTSTR fpa;
LPTSTR tpath;
size_t alloc, len;
tpath = grub_util_utf8_to_tchar (path);
alloc = PATH_MAX;
while (1)
{
fpa = xmalloc (alloc * sizeof (fpa[0]));
len = GetFullPathName (tpath, alloc, fpa, NULL);
if (len >= alloc)
{
free (fpa);
alloc = 2 * (len + 2);
continue;
}
if (len == 0)
{
free (fpa);
return tpath;
}
free (tpath);
return fpa;
}
}
#ifdef __CYGWIN__
LPTSTR
grub_util_get_windows_path (const char *path)
{
LPTSTR winpath;
/* Workaround cygwin bugs with //?/. */
if ((path[0] == '\\' || path[0] == '/')
&& (path[1] == '\\' || path[1] == '/')
&& (path[2] == '?' || path[2] == '.')
&& (path[3] == '\\' || path[3] == '/'))
return grub_util_get_windows_path_real (path);
winpath = xmalloc (sizeof (winpath[0]) * PATH_MAX);
memset (winpath, 0, sizeof (winpath[0]) * PATH_MAX);
if (cygwin_conv_path ((sizeof (winpath[0]) == 1 ? CCP_POSIX_TO_WIN_A
: CCP_POSIX_TO_WIN_W) | CCP_ABSOLUTE, path, winpath,
sizeof (winpath[0]) * PATH_MAX))
@ -113,20 +155,7 @@ grub_util_get_windows_path (const char *path)
LPTSTR
grub_util_get_windows_path (const char *path)
{
LPTSTR fpa;
LPTSTR tpath;
tpath = grub_util_utf8_to_tchar (path);
fpa = xmalloc (PATH_MAX * sizeof (fpa[0]));
if (!_wfullpath (fpa, tpath, PATH_MAX))
{
free (fpa);
return tpath;
}
free (tpath);
return fpa;
return grub_util_get_windows_path_real (path);
}
#endif