JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* cygheap.cc (init_cygheap::init_installation_root): Convert function

Browse Source 
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.
This commit is contained in:
Corinna Vinschen
2012-02-14 11:27:43 +00:00
parent 78b5f9545d
commit 8895d962d5
13 changed files with 140 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/dtable.cc
View File

@@ -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'-')