OSDN Git Service

* mount.cc (mount_info::init): Recreate path when trying to read the
authorcorinna <corinna>
Sat, 24 May 2008 10:07:49 +0000 (10:07 +0000)
committercorinna <corinna>
Sat, 24 May 2008 10:07:49 +0000 (10:07 +0000)
user fstab file.

winsup/cygwin/ChangeLog
winsup/cygwin/mount.cc

index 7e97504..c911eb6 100644 (file)
@@ -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>
index eb10425..77de8f2 100644 (file)
@@ -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)