* 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:
@@ -1,6 +1,6 @@
|
||||
/* fhandler_mailslot.cc. See fhandler.h for a description of the fhandler classes.
|
||||
|
||||
Copyright 2005, 2007, 2008, 2009, 2010, 2011 Red Hat, Inc.
|
||||
Copyright 2005, 2007, 2008, 2009, 2010, 2011, 2012 Red Hat, Inc.
|
||||
|
||||
This file is part of Cygwin.
|
||||
|
||||
@@ -11,8 +11,11 @@
|
||||
#include "winsup.h"
|
||||
|
||||
#include "cygerrno.h"
|
||||
#include "security.h"
|
||||
#include "path.h"
|
||||
#include "fhandler.h"
|
||||
#include "dtable.h"
|
||||
#include "cygheap.h"
|
||||
#include "ntdll.h"
|
||||
#include "shared_info.h"
|
||||
#include "tls_pbuf.h"
|
||||
@@ -51,7 +54,7 @@ fhandler_mailslot::get_object_attr (OBJECT_ATTRIBUTES &attr,
|
||||
{
|
||||
|
||||
RtlCopyUnicodeString (path, pc.get_nt_native_path ());
|
||||
RtlAppendUnicodeStringToString (path, &installation_key);
|
||||
RtlAppendUnicodeStringToString (path, &cygheap->installation_key);
|
||||
InitializeObjectAttributes (&attr, path,
|
||||
OBJ_CASE_INSENSITIVE
|
||||
| (flags & O_CLOEXEC ? 0 : OBJ_INHERIT),
|
||||
|
Reference in New Issue
Block a user