diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-12 14:15:32 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-05-12 14:15:32 +0000 |
| commit | ffdcfe2414e881753ba6be9a91b43fa224fc5cf6 (patch) | |
| tree | cd9feecdfda313004ce5e2e7858a390707c46305 /win32 | |
| parent | bdcd05cf0865ec935feaee1e3f1f408261dafb39 (diff) | |
| download | ruby-ffdcfe2414e881753ba6be9a91b43fa224fc5cf6.tar.gz ruby-ffdcfe2414e881753ba6be9a91b43fa224fc5cf6.tar.xz ruby-ffdcfe2414e881753ba6be9a91b43fa224fc5cf6.zip | |
* 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: http://svn.ruby-lang.org/repos/ruby/trunk@16395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/win32/win32.c b/win32/win32.c index 48be4df66..abc62d998 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 = "<Unknown>"; return; } |