From: Christopher Faylor <me@cgf.cx>
Date: Fri, 23 May 2008 15:33:03 +0000 (+0000)
Subject: * mount.cc (mount_info::from_fstab): Use cygwin_hmodule rather than trying to
X-Git-Tag: msnyder-reverse-20080609-branchpoint~27
X-Git-Url: https://sourceware.org/git/?a=commitdiff_plain;h=7cd454287369cf3918cb31ed3d8b284eb42e257a;p=newlib-cygwin.git

* mount.cc (mount_info::from_fstab): Use cygwin_hmodule rather than trying to
find handle based on cygwin1.dll.
* path.cc (symlink_info::check): Remove unused variable.
---

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 50d94cc97..bd426b210 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-23  Christopher Faylor  <me+cygwin@cgf.cx>
+
+	* mount.cc (mount_info::from_fstab): Use cygwin_hmodule rather than
+	trying to find handle based on cygwin1.dll.
+
+	* path.cc (symlink_info::check): Remove unused variable.
+
 2008-05-22  Corinna Vinschen  <corinna@vinschen.de>
 
 	* shared.cc (open_shared): Fix comments.  Fix a condition which has
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index 5ecb63947..1d7d7cda7 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -877,10 +877,9 @@ mount_info::from_fstab (bool user)
   PWCHAR path = path_buf;
   PWCHAR w;
   
-  if (!GetModuleFileNameW (GetModuleHandleW (L"cygwin1.dll"),
-			   path, NT_MAX_PATH))
+  if (!GetModuleFileNameW (cygwin_hmodule, path, NT_MAX_PATH))
     {
-      debug_printf ("GetModuleFileNameW, %E");
+      debug_printf ("GetModuleFileNameW(%p, path, %u), %E", cygwin_hmodule, NT_MAX_PATH);
       return false;
     }
   w = wcsrchr (path, L'\\');
diff --git a/winsup/cygwin/path.cc b/winsup/cygwin/path.cc
index 102326d1e..dd7ba44b3 100644
--- a/winsup/cygwin/path.cc
+++ b/winsup/cygwin/path.cc
@@ -2350,7 +2350,6 @@ symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt,
       FILE_BASIC_INFORMATION fbi;
       NTSTATUS status;
       IO_STATUS_BLOCK io;
-      bool no_ea = false;
 
       error = 0;
       get_nt_native_path (suffix.path, upath, pflags & MOUNT_ENC);
@@ -2374,7 +2373,6 @@ symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt,
       /* No right to access EAs or EAs not supported? */
       if (status == STATUS_ACCESS_DENIED || status == STATUS_EAS_NOT_SUPPORTED)
 	{
-	  no_ea = true;
 	  /* If EAs are not supported, there's no sense to check them again
 	     whith suffixes attached.  So we set eabuf/easize to 0 here once. */
 	  if (status == STATUS_EAS_NOT_SUPPORTED)