drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* cygheap.cc (init_cygheap::init_installation_root): Rearrange code 

creating valid native NT installation_root path.  Only strip last
	backslash from path if the result is a valid NT path.  Explain why.
This commit is contained in:
Corinna Vinschen 2012-06-18 20:17:15 +00:00
parent 4ae6378382
commit 099817c3db
2 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2012-06-18 Corinna Vinschen <corinna@vinschen.de>
* cygheap.cc (init_cygheap::init_installation_root): Rearrange code
creating valid native NT installation_root path. Only strip last
backslash from path if the result is a valid NT path. Explain why.
2012-06-17 Christopher Faylor <me.cygwin2012@cgf.cx> 2012-06-17 Christopher Faylor <me.cygwin2012@cgf.cx>
Add '#include "cygwait.h"' throughout, where appropriate. Add '#include "cygwait.h"' throughout, where appropriate.

28
winsup/cygwin/cygheap.cc
View File

@ -170,18 +170,28 @@ init_cygheap::init_installation_root ()
"GetModuleFileNameW(%p, %p, %u), %E", "GetModuleFileNameW(%p, %p, %u), %E",
cygwin_hmodule, installation_root, PATH_MAX); cygwin_hmodule, installation_root, PATH_MAX);
PWCHAR p = installation_root; PWCHAR p = installation_root;
if (wcsncmp (p, L"\\\\?\\", 4)) /* No long path prefix. */ if (wcsncasecmp (p, L"\\\\", 2)) /* Normal drive letter path */
{ {
if (!wcsncasecmp (p, L"\\\\", 2)) /* UNC */ p = wcpcpy (p, L"\\??\\");
GetModuleFileNameW (cygwin_hmodule, p, PATH_MAX - 4);
}
else
{
bool unc = false;
if (wcsncmp (p + 2, L"?\\", 2)) /* No long path prefix, so UNC path. */
{ {
p = wcpcpy (p, L"\\??\\UN"); p = wcpcpy (p, L"\\??\\UN");
GetModuleFileNameW (cygwin_hmodule, p, PATH_MAX - 6); GetModuleFileNameW (cygwin_hmodule, p, PATH_MAX - 6);
*p = L'C'; *p = L'C';
unc = true;
} }
else else if (!wcsncmp (p + 4, L"UNC\\", 4)) /* Native NT UNC path. */
unc = true;
if (unc)
{ {
p = wcpcpy (p, L"\\??\\"); p = wcschr (p + 2, L'\\'); /* Skip server name */
GetModuleFileNameW (cygwin_hmodule, p, PATH_MAX - 4); if (p)
p = wcschr (p + 1, L'\\'); /* Skip share name */
} }
} }
installation_root[1] = L'?'; installation_root[1] = L'?';
@ -200,7 +210,13 @@ init_cygheap::init_installation_root ()
if (!w) if (!w)
api_fatal ("Can't initialize Cygwin installation root dir.\n" api_fatal ("Can't initialize Cygwin installation root dir.\n"
"Invalid DLL path"); "Invalid DLL path");
*w = L'\0'; /* If w < p, the Cygwin DLL resides in the root dir of a drive or network
path. In that case, if we strip off yet another backslash, the path
becomes invalid. We avoid that here so that the DLL also works in this
scenario. The /usr/bin and /usr/lib default mounts will probably point
to something non-existing, but that's life. */
if (w > p)
*w = L'\0';
for (int i = 1; i >= 0; --i) for (int i = 1; i >= 0; --i)
{ {