From 6d171b4482689bd1c8a49af94e57d451c8f66448 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Fri, 14 Jun 2002 21:46:19 +0000 Subject: * 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. --- winsup/cygwin/environ.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/environ.cc') diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index 737c68d7f..9ed6e4142 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -765,8 +765,8 @@ static NO_COPY spenv spenvs[] = {"LOGONSERVER=", &cygheap_user::env_logsrv}, {"SYSTEMDRIVE=", NULL}, {"SYSTEMROOT=", NULL}, - {"USERDOMAIN=", &cygheap_user::env_name}, - {"USERNAME=", &cygheap_user::env_domain}, + {"USERDOMAIN=", &cygheap_user::env_domain}, + {"USERNAME=", &cygheap_user::env_name}, {"USERPROFILE=", &cygheap_user::env_userprofile}, }; @@ -939,6 +939,7 @@ build_env (const char * const *envp, char *&envblock, int &envc, of buffer */ } + debug_printf ("envp %p, envc %d", newenv, envc); return newenv; } -- cgit v1.2.3