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

* mount.cc (mount_info::from_fstab): Skip native path prefix in

Browse Source 
module path.
This commit is contained in:
Corinna Vinschen
2008-04-29 20:48:09 +00:00
parent 59c7f5bcdf
commit 661efd2dea
2 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@@ -1,3 +1,8 @@
2008-04-29 Corinna Vinschen <corinna@vinschen.de>
* mount.cc (mount_info::from_fstab): Skip native path prefix in
module path.
2008-04-29 Corinna Vinschen <corinna@vinschen.de> 2008-04-29 Corinna Vinschen <corinna@vinschen.de>
* syscalls.cc (rename): Use volume serial numbers stored in path_conv * syscalls.cc (rename): Use volume serial numbers stored in path_conv

9
winsup/cygwin/mount.cc
View File

@@ -871,7 +871,8 @@ bool
mount_info::from_fstab (bool user) mount_info::from_fstab (bool user)
{ {
tmp_pathbuf tp; tmp_pathbuf tp;
PWCHAR path = tp.w_get (); PWCHAR path_buf = tp.w_get ();
PWCHAR path = path_buf;
PWCHAR w; PWCHAR w;
if (!GetModuleFileNameW (GetModuleHandleW (L"cygwin1.dll"), if (!GetModuleFileNameW (GetModuleHandleW (L"cygwin1.dll"),
@@ -880,6 +881,12 @@ mount_info::from_fstab (bool user)
debug_printf ("GetModuleFileNameW, %E"); debug_printf ("GetModuleFileNameW, %E");
return false; return false;
} }
if (!wcsncmp (path, L"\\\\?\\", 4))
{
path += 4;
if (path[1] != L':')
*(path += 2) = L'\\';
}
w = wcsrchr (path, L'\\'); w = wcsrchr (path, L'\\');
if (w) if (w)
{ {