* 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.
This commit is contained in:
Corinna Vinschen
@@ -1,7 +1,7 @@
|
||||
/* shared.cc: shared data area support.
|
||||
|
||||
Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
|
||||
2006, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
|
||||
2006, 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@@ -34,96 +34,6 @@ user_info NO_COPY *user_shared;
|
||||
HANDLE NO_COPY cygwin_shared_h;
|
||||
HANDLE NO_COPY cygwin_user_h;
|
||||
|
||||
WCHAR installation_root[PATH_MAX] __attribute__((section (".cygwin_dll_common"), shared));
|
||||
UNICODE_STRING installation_key __attribute__((section (".cygwin_dll_common"), shared));
|
||||
WCHAR installation_key_buf[18] __attribute__((section (".cygwin_dll_common"), shared));
|
||||
static LONG installation_root_inited __attribute__((section (".cygwin_dll_common"), shared));
|
||||
|
||||
#define SPIN_WAIT 10000
|
||||
|
||||
/* Use absolute path of cygwin1.dll to derive the Win32 dir which
|
||||
is our installation_root. Note that we can't handle Cygwin installation
|
||||
root dirs of more than 4K path length. I assume that's ok...
|
||||
|
||||
This function also generates the installation_key value. It's a 64 bit
|
||||
hash value based on the path of the Cygwin DLL itself. It's subsequently
|
||||
used when generating shared object names. Thus, different Cygwin
|
||||
installations generate different object names and so are isolated from
|
||||
each other.
|
||||
|
||||
Having this information, the installation key together with the
|
||||
installation root path is written to the registry. The idea is that
|
||||
cygcheck can print the paths into which the Cygwin DLL has been
|
||||
installed for debugging purposes.
|
||||
|
||||
Last but not least, the new cygwin properties datastrcuture is checked
|
||||
for the "disabled_key" value, which is used to determine whether the
|
||||
installation key is actually added to all object names or not. This is
|
||||
used as a last resort for debugging purposes, usually. However, there
|
||||
could be another good reason to re-enable object name collisions between
|
||||
multiple Cygwin DLLs, which we're just not aware of right now. Cygcheck
|
||||
can be used to change the value in an existing Cygwin DLL binary. */
|
||||
|
||||
void inline
|
||||
init_installation_root ()
|
||||
{
|
||||
spinlock iri (installation_root_inited);
|
||||
if (!iri)
|
||||
{
|
||||
if (!GetModuleFileNameW (cygwin_hmodule, installation_root, PATH_MAX))
|
||||
api_fatal ("Can't initialize Cygwin installation root dir.\n"
|
||||
"GetModuleFileNameW(%p, %p, %u), %E",
|
||||
cygwin_hmodule, installation_root, PATH_MAX);
|
||||
PWCHAR p = installation_root;
|
||||
if (wcsncmp (p, L"\\\\?\\", 4)) /* No long path prefix. */
|
||||
{
|
||||
if (!wcsncasecmp (p, L"\\\\", 2)) /* UNC */
|
||||
{
|
||||
p = wcpcpy (p, L"\\??\\UN");
|
||||
GetModuleFileNameW (cygwin_hmodule, p, PATH_MAX - 6);
|
||||
*p = L'C';
|
||||
}
|
||||
else
|
||||
{
|
||||
p = wcpcpy (p, L"\\??\\");
|
||||
GetModuleFileNameW (cygwin_hmodule, p, PATH_MAX - 4);
|
||||
}
|
||||
}
|
||||
installation_root[1] = L'?';
|
||||
|
||||
RtlInitEmptyUnicodeString (&installation_key, installation_key_buf,
|
||||
sizeof installation_key_buf);
|
||||
RtlInt64ToHexUnicodeString (hash_path_name (0, installation_root),
|
||||
&installation_key, FALSE);
|
||||
|
||||
PWCHAR w = wcsrchr (installation_root, L'\\');
|
||||
if (w)
|
||||
{
|
||||
*w = L'\0';
|
||||
w = wcsrchr (installation_root, L'\\');
|
||||
}
|
||||
if (!w)
|
||||
api_fatal ("Can't initialize Cygwin installation root dir.\n"
|
||||
"Invalid DLL path");
|
||||
*w = L'\0';
|
||||
|
||||
for (int i = 1; i >= 0; --i)
|
||||
{
|
||||
reg_key r (i, KEY_WRITE, _WIDE (CYGWIN_INFO_INSTALLATIONS_NAME),
|
||||
NULL);
|
||||
if (NT_SUCCESS (r.set_string (installation_key_buf,
|
||||
installation_root)))
|
||||
break;
|
||||
}
|
||||
|
||||
if (cygwin_props.disable_key)
|
||||
{
|
||||
installation_key.Length = 0;
|
||||
installation_key.Buffer[0] = L'\0';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* This function returns a handle to the top-level directory in the global
|
||||
NT namespace used to implement global objects including shared memory. */
|
||||
|
||||
@@ -142,7 +52,7 @@ get_shared_parent_dir ()
|
||||
__small_swprintf (bnoname, L"\\BaseNamedObjects\\%s%s-%S",
|
||||
cygwin_version.shared_id,
|
||||
_cygwin_testing ? cygwin_version.dll_build_date : "",
|
||||
&installation_key);
|
||||
&cygheap->installation_key);
|
||||
RtlInitUnicodeString (&uname, bnoname);
|
||||
InitializeObjectAttributes (&attr, &uname, OBJ_OPENIF, NULL,
|
||||
everyone_sd (CYG_SHARED_DIR_ACCESS));
|
||||
@@ -178,7 +88,7 @@ get_session_parent_dir ()
|
||||
L"\\Sessions\\BNOLINKS\\%d\\%s%s-%S",
|
||||
psi.SessionId, cygwin_version.shared_id,
|
||||
_cygwin_testing ? cygwin_version.dll_build_date : "",
|
||||
&installation_key);
|
||||
&cygheap->installation_key);
|
||||
RtlInitUnicodeString (&uname, bnoname);
|
||||
InitializeObjectAttributes (&attr, &uname, OBJ_OPENIF, NULL,
|
||||
everyone_sd(CYG_SHARED_DIR_ACCESS));
|
||||
@@ -422,7 +332,7 @@ shared_info::initialize ()
|
||||
up to this point. Debug output except for system_printf requires
|
||||
the global shared memory to exist. */
|
||||
debug_printf ("Installation root: <%W> key: <%S>",
|
||||
installation_root, &installation_key);
|
||||
cygheap->installation_root, &cygheap->installation_key);
|
||||
}
|
||||
else if (sversion != (LONG) CURR_SHARED_MAGIC)
|
||||
sversion.multiple_cygwin_problem ("system shared memory version",
|
||||
@@ -441,9 +351,9 @@ memory_init (bool init_cygheap)
|
||||
{
|
||||
cygheap_init ();
|
||||
cygheap->user.init ();
|
||||
cygheap->init_installation_root (); /* Requires user.init! */
|
||||
}
|
||||
|
||||
init_installation_root (); /* Initialize installation root dir */
|
||||
shared_info::create (); /* Initialize global shared memory */
|
||||
user_info::create (false); /* Initialize per-user shared memory */
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user