* cygheap.cc (cygheap_fixup_in_child): Drop call to set_dll_dir.
(init_cygheap::init_installation_root): Set installation_dir_len. (setup_cygheap): Drop call to set_dll_dir. * cygheap.h (struct init_cygheap): Add installation_dir_len member. (init_cygheap::set_dll_dir): Remove. * environ.cc (win_env::add_cache): Use stpcpy for speed. (posify_maybe): Use tmp_pathbuf buffer instead of stack. (raise_envblock): New function to resize Windows environment block. (build_env): Fix indentation. Call raise_envblock function. Check if $PATH exists and is non-empty. If not, add PATH variable with Cygwin installation directory as content to Windows environment. Explain why. * uinfo.cc (cygheap_pwdgrp::_nss_init): Fill UNICODE_STRING members on the fly. Drop call to RtlInitUnicodeString. (pwdgrp::check_file): Ditto.
This commit is contained in:
@@ -83,7 +83,6 @@ cygheap_fixup_in_child (bool execed)
|
||||
_csbrk ((char *) child_proc_info->cygheap_max - (char *) cygheap);
|
||||
child_copy (child_proc_info->parent, false, "cygheap", cygheap, cygheap_max, NULL);
|
||||
cygheap_init ();
|
||||
cygheap->set_dll_dir ();
|
||||
debug_fixup_after_fork_exec ();
|
||||
if (execed)
|
||||
{
|
||||
@@ -188,9 +187,10 @@ init_cygheap::init_installation_root ()
|
||||
"Invalid DLL path");
|
||||
|
||||
/* Copy result into installation_dir before stripping off "bin" dir and
|
||||
revert to Win32 path. This path is used in cygheap_init to call
|
||||
SetDllDirectory. */
|
||||
wcpncpy (installation_dir, installation_root, PATH_MAX);
|
||||
revert to Win32 path. This path is added to the Windows environment
|
||||
in buildenv. See there for a description. */
|
||||
installation_dir_len = wcpncpy (installation_dir, installation_root, PATH_MAX)
|
||||
- installation_dir;
|
||||
installation_dir[1] = L'\\';
|
||||
|
||||
/* If w < p, the Cygwin DLL resides in the root dir of a drive or network
|
||||
@@ -264,7 +264,6 @@ setup_cygheap ()
|
||||
cygheap_init ();
|
||||
cygheap->user.init ();
|
||||
cygheap->init_installation_root (); /* Requires user.init! */
|
||||
cygheap->set_dll_dir ();
|
||||
cygheap->pg.init ();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user