diff options
| author | Christopher Faylor <me@cgf.cx> | 2002-06-14 21:46:19 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2002-06-14 21:46:19 +0000 |
| commit | 6d171b4482689bd1c8a49af94e57d451c8f66448 (patch) | |
| tree | babdadeed9f28974354c25073eb06863c7f9da03 /winsup/cygwin/spawn.cc | |
| parent | b56d7e7937d0604025833e8c881f96c1d0e4147f (diff) | |
| download | cygnal-6d171b4482689bd1c8a49af94e57d451c8f66448.tar.gz cygnal-6d171b4482689bd1c8a49af94e57d451c8f66448.tar.bz2 cygnal-6d171b4482689bd1c8a49af94e57d451c8f66448.zip | |
* cygheap.h (cygheap_user::userprofile_env_buf): New static member.
* environ.cc (build_env): Add debugging statement.
(spenvs): Switch functions for USERDOMAIN and USERNAME.
* spawn.cc (spawn_guts): Move environment initialization prior to
cygheap_setup_for_child or environment info will never be copied to child.
Diffstat (limited to 'winsup/cygwin/spawn.cc')
| -rw-r--r-- | winsup/cygwin/spawn.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/winsup/cygwin/spawn.cc b/winsup/cygwin/spawn.cc index 1f92c7f76..3841e845b 100644 --- a/winsup/cygwin/spawn.cc +++ b/winsup/cygwin/spawn.cc @@ -613,9 +613,9 @@ spawn_guts (const char * prog_arg, const char *const *argv, if (!cygheap->user.impersonated || cygheap->user.token == INVALID_HANDLE_VALUE) { PSECURITY_ATTRIBUTES sec_attribs = sec_user_nih (sa_buf); - newheap = cygheap_setup_for_child (&ciresrv, cygheap->fdtab.need_fixup_before ()); ciresrv.moreinfo->envp = build_env (envp, envblock, ciresrv.moreinfo->envc, real_path.iscygexec ()); + newheap = cygheap_setup_for_child (&ciresrv, cygheap->fdtab.need_fixup_before ()); rc = CreateProcess (runpath, /* image name - with full path */ one_line.buf, /* what was passed to exec */ sec_attribs, /* process security attrs */ @@ -656,9 +656,9 @@ spawn_guts (const char * prog_arg, const char *const *argv, strcat (wstname, dskname); si.lpDesktop = wstname; - newheap = cygheap_setup_for_child (&ciresrv, cygheap->fdtab.need_fixup_before ()); ciresrv.moreinfo->envp = build_env (envp, envblock, ciresrv.moreinfo->envc, real_path.iscygexec ()); + newheap = cygheap_setup_for_child (&ciresrv, cygheap->fdtab.need_fixup_before ()); rc = CreateProcessAsUser (cygheap->user.token, runpath, /* image name - with full path */ one_line.buf, /* what was passed to exec */ |