From 9416fedc282b6bd96fe1f150833db3e365029767 Mon Sep 17 00:00:00 2001 From: usa Date: Mon, 12 May 2008 14:15:32 +0000 Subject: * process.c, include/ruby/intern.h (rb_run_exec_options): externed. * process.c (save_redirect_fd, save_env_i, save_env, run_exec_dup2, run_exec_open, run_exec_pgroup, run_exec_rlimit, rb_run_exec_options): save parent's process environments. !!!remark!!! these are not thread-safe. * process.c (rb_spawn_internal): remove calling run_exec_options() because cannot restore after spawn. we'll fix this later. * io.c (pipe_open): ditto. * test/ruby/test_process.rb (test_execopts_env): upcase environment variable name for case insensitive platforms. * win32/win32.c (init_env): set USER environment variable only when USERNAME is available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- win32/win32.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'win32/win32.c') diff --git a/win32/win32.c b/win32/win32.c index 48be4df66e..abc62d9987 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -376,11 +376,10 @@ init_env(void) } if (!GetEnvironmentVariable("USER", env, sizeof env)) { - if (GetEnvironmentVariable("USERNAME", env, sizeof env) || - GetUserName(env, (len = sizeof env, &len))) { + if (GetEnvironmentVariable("USERNAME", env, sizeof env)) { SetEnvironmentVariable("USER", env); } - else { + else if (!GetUserName(env, (len = sizeof env, &len))) { NTLoginName = ""; return; } -- cgit v1.2.3