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

* path.cc (read_mounts): Skip unnecessary test if path has been

Browse Source 
fetched from loaded cygwin1.dll.
This commit is contained in:
Corinna Vinschen 2009-11-04 17:09:32 +00:00
parent b5f48aa961
commit 13e8e14ab5
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2009-11-04 Corinna Vinschen <corinna@vinschen.de>
* path.cc (read_mounts): Skip unnecessary test if path has been
fetched from loaded cygwin1.dll.
2009-11-04 Corinna Vinschen <corinna@vinschen.de> 2009-11-04 Corinna Vinschen <corinna@vinschen.de>
* cygcheck.cc (cygwin_dll_path): New global variable. * cygcheck.cc (cygwin_dll_path): New global variable.

16
winsup/utils/path.cc
View File

@ -594,12 +594,16 @@ read_mounts ()
path_end = wcsrchr (path, L'\\'); path_end = wcsrchr (path, L'\\');
if (path_end) if (path_end)
{ {
wcscpy (path_end, L"\\cygwin1.dll"); if (!cygwin_dll_path[0])
DWORD attr = GetFileAttributesW (path); {
if (attr == (DWORD) -1 wcscpy (path_end, L"\\cygwin1.dll");
|| (attr & (FILE_ATTRIBUTE_DIRECTORY | FILE_ATTRIBUTE_REPARSE_POINT))) DWORD attr = GetFileAttributesW (path);
path_end = NULL; if (attr == (DWORD) -1
else || (attr & (FILE_ATTRIBUTE_DIRECTORY
| FILE_ATTRIBUTE_REPARSE_POINT)))
path_end = NULL;
}
if (path_end)
{ {
*path_end = L'\0'; *path_end = L'\0';
path_end = wcsrchr (path, L'\\'); path_end = wcsrchr (path, L'\\');