diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2008-05-24 10:07:49 +0000 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2008-05-24 10:07:49 +0000 |
| commit | 0fd62c686d9297460a40dcf28932683276d516dc (patch) | |
| tree | b7036968b90695b7ba1f3ea3757cd0c3f5755205 | |
| parent | 362ce9fa9958fa5cab6820da8117c6ace28a2349 (diff) | |
| download | cygnal-0fd62c686d9297460a40dcf28932683276d516dc.tar.gz cygnal-0fd62c686d9297460a40dcf28932683276d516dc.tar.bz2 cygnal-0fd62c686d9297460a40dcf28932683276d516dc.zip | |
* mount.cc (mount_info::init): Recreate path when trying to read the
user fstab file.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/mount.cc | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 7e97504fa..c911eb634 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,10 @@ 2008-05-24 Corinna Vinschen <corinna@vinschen.de> + * mount.cc (mount_info::init): Recreate path when trying to read the + user fstab file. + +2008-05-24 Corinna Vinschen <corinna@vinschen.de> + * path.cc (symlink_info::check): Reorder test for nfs symlinks. 2008-05-23 Corinna Vinschen <corinna@vinschen.de> diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc index eb10425d0..77de8f2c3 100644 --- a/winsup/cygwin/mount.cc +++ b/winsup/cygwin/mount.cc @@ -125,7 +125,9 @@ mount_info::init () { create_root_entry (path); pathend = wcpcpy (pathend, L"\\etc\\fstab"); - if (from_fstab (false, path, pathend) | from_fstab (true, path, pathend)) /* The single | is correct! */ + if (from_fstab (false, path, pathend) /* The single | is correct! */ + | from_fstab (true, path, wcpcpy (find_root_from_cygwin_dll (path), + L"\\etc\\fstab"))) return; } @@ -923,7 +925,7 @@ mount_info::from_fstab (bool user, WCHAR fstab[], PWCHAR fstab_end) sys_mbstowcs (wcpcpy (fstab_end, L".d\\"), NT_MAX_PATH - (fstab_end - fstab), cygheap->user.name ()); - debug_printf ("Try to read mounts from %W", fstab); + system_printf ("Try to read mounts from %W", fstab); HANDLE h = CreateFileW (fstab, GENERIC_READ, FILE_SHARE_READ, &sec_none_nih, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (h == INVALID_HANDLE_VALUE) |