* 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.
This commit is contained in:
parent
1fc3031588
commit
7cd4542873
|
@ -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>
|
2008-05-22 Corinna Vinschen <corinna@vinschen.de>
|
||||||
|
|
||||||
* shared.cc (open_shared): Fix comments. Fix a condition which has
|
* shared.cc (open_shared): Fix comments. Fix a condition which has
|
||||||
|
|
|
@ -877,10 +877,9 @@ mount_info::from_fstab (bool user)
|
||||||
PWCHAR path = path_buf;
|
PWCHAR path = path_buf;
|
||||||
PWCHAR w;
|
PWCHAR w;
|
||||||
|
|
||||||
if (!GetModuleFileNameW (GetModuleHandleW (L"cygwin1.dll"),
|
if (!GetModuleFileNameW (cygwin_hmodule, path, NT_MAX_PATH))
|
||||||
path, NT_MAX_PATH))
|
|
||||||
{
|
{
|
||||||
debug_printf ("GetModuleFileNameW, %E");
|
debug_printf ("GetModuleFileNameW(%p, path, %u), %E", cygwin_hmodule, NT_MAX_PATH);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
w = wcsrchr (path, L'\\');
|
w = wcsrchr (path, L'\\');
|
||||||
|
|
|
@ -2350,7 +2350,6 @@ symlink_info::check (char *path, const suffix_info *suffixes, unsigned opt,
|
||||||
FILE_BASIC_INFORMATION fbi;
|
FILE_BASIC_INFORMATION fbi;
|
||||||
NTSTATUS status;
|
NTSTATUS status;
|
||||||
IO_STATUS_BLOCK io;
|
IO_STATUS_BLOCK io;
|
||||||
bool no_ea = false;
|
|
||||||
|
|
||||||
error = 0;
|
error = 0;
|
||||||
get_nt_native_path (suffix.path, upath, pflags & MOUNT_ENC);
|
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? */
|
/* No right to access EAs or EAs not supported? */
|
||||||
if (status == STATUS_ACCESS_DENIED || status == STATUS_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
|
/* 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. */
|
whith suffixes attached. So we set eabuf/easize to 0 here once. */
|
||||||
if (status == STATUS_EAS_NOT_SUPPORTED)
|
if (status == STATUS_EAS_NOT_SUPPORTED)
|
||||||
|
|
Loading…
Reference in New Issue