diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-04-29 20:48:09 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-04-29 20:48:09 +0000 |
| commit | 661efd2deaf2042829683112411be7f7902abe13 (patch) | |
| tree | 527cf791a89e2ac41732e6d730d3858476905e0e | |
| parent | 59c7f5bcdfee597e6e250edeccfb3a0786955f13 (diff) | |
| download | cygnal-661efd2deaf2042829683112411be7f7902abe13.tar.gz cygnal-661efd2deaf2042829683112411be7f7902abe13.tar.bz2 cygnal-661efd2deaf2042829683112411be7f7902abe13.zip | |
* mount.cc (mount_info::from_fstab): Skip native path prefix in
module path.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/mount.cc | 9 |
2 files changed, 13 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d095fe14d..231664b54 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 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> + * syscalls.cc (rename): Use volume serial numbers stored in path_conv rather than fetching them here for the "same file" test. Change comment to reflect this. diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc index e97121b83..5fdef2d09 100644 --- a/winsup/cygwin/mount.cc +++ b/winsup/cygwin/mount.cc @@ -871,7 +871,8 @@ bool mount_info::from_fstab (bool user) { tmp_pathbuf tp; - PWCHAR path = tp.w_get (); + PWCHAR path_buf = tp.w_get (); + PWCHAR path = path_buf; PWCHAR w; if (!GetModuleFileNameW (GetModuleHandleW (L"cygwin1.dll"), @@ -880,6 +881,12 @@ mount_info::from_fstab (bool user) debug_printf ("GetModuleFileNameW, %E"); return false; } + if (!wcsncmp (path, L"\\\\?\\", 4)) + { + path += 4; + if (path[1] != L':') + *(path += 2) = L'\\'; + } w = wcsrchr (path, L'\\'); if (w) { |