diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2012-02-14 15:27:43 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2012-02-14 15:27:43 +0400 |
| commit | 8895d962d5fbb79dcd65db9d801644fb1fa2ca5e (patch) | |
| tree | 568ff46275526ede41d3ece8bff992e68d5708e2 /winsup/cygwin/dtable.cc | |
| parent | 78b5f9545ddb8c8cc7cb460e161ec04ddbf2abcb (diff) | |
* cygheap.cc (init_cygheap::init_installation_root): Convert function
init_installation_root into a cygheap method.
* cygheap.h (struct init_cygheap): Move installation_root,
installation_key, and installation_key_buf from shared
.cygwin_dll_common DLL section to cygheap. Declare new method
init_installation_root.
* dtable.cc (handle_to_fn): Accommodate the move of installation strings
to the cygheap.
* external.cc (cygwin_internal): Ditto.
* fhandler_console.cc (fhandler_console::open_shared_console): Ditto.
* fhandler_mailslot.cc (fhandler_mailslot::get_object_attr): Ditto.
* fhandler_tty.cc: Ditto, throughout.
* mount.cc (mount_info::init): Ditto.
* pipe.cc (fhandler_pipe::create): Ditto.
* shared.cc: Ditto, throughout.
(installation_root): Remove.
(installation_key): Move to cygheap.
(installation_key_buf): Ditto.
(installation_root_inited): Remove.
(SPIN_WAIT): Remove.
(init_installation_root): Move to cygheap.
(memory_init): Call cygheap->init_installation_root right after
cygheap->user.init. Drop call of init_installation_root function.
* shared_info.h (init_installation_root): Drop declaration.
(installation_root): Ditto.
(installation_key): Ditto.
* uinfo.cc (pwdgrp::load): Accommodate the move of installation strings
to the cygheap.
Diffstat (limited to 'winsup/cygwin/dtable.cc')
| -rw-r--r-- | winsup/cygwin/dtable.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/winsup/cygwin/dtable.cc b/winsup/cygwin/dtable.cc index fa442f771..f152b82a3 100644 --- a/winsup/cygwin/dtable.cc +++ b/winsup/cygwin/dtable.cc @@ -931,8 +931,9 @@ handle_to_fn (HANDLE h, char *posix_fn) return false; w32 += WCLEN (L"cygwin-"); /* Check for installation key and trailing dash. */ - w32len = installation_key.Length / sizeof (WCHAR); - if (w32len && wcsncmp (w32, installation_key.Buffer, w32len) != 0) + w32len = cygheap->installation_key.Length / sizeof (WCHAR); + if (w32len + && wcsncmp (w32, cygheap->installation_key.Buffer, w32len) != 0) return false; w32 += w32len; if (*w32 != L'-') |