summaryrefslogtreecommitdiffstats
path: root/winsup/cygwin/mount.cc
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2012-02-14 11:27:43 +0000
committerCorinna Vinschen <corinna@vinschen.de>2012-02-14 11:27:43 +0000
commit8895d962d5fbb79dcd65db9d801644fb1fa2ca5e (patch)
tree568ff46275526ede41d3ece8bff992e68d5708e2 /winsup/cygwin/mount.cc
parent78b5f9545ddb8c8cc7cb460e161ec04ddbf2abcb (diff)
downloadcygnal-8895d962d5fbb79dcd65db9d801644fb1fa2ca5e.tar.gz
cygnal-8895d962d5fbb79dcd65db9d801644fb1fa2ca5e.tar.bz2
cygnal-8895d962d5fbb79dcd65db9d801644fb1fa2ca5e.zip
* 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/mount.cc')
-rw-r--r--winsup/cygwin/mount.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/winsup/cygwin/mount.cc b/winsup/cygwin/mount.cc
index 5724298b3..ef7d746df 100644
--- a/winsup/cygwin/mount.cc
+++ b/winsup/cygwin/mount.cc
@@ -467,7 +467,7 @@ mount_info::init ()
PWCHAR pathend;
WCHAR path[PATH_MAX];
- pathend = wcpcpy (path, installation_root);
+ pathend = wcpcpy (path, cygheap->installation_root);
create_root_entry (path);
pathend = wcpcpy (pathend, L"\\etc\\fstab");