diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-02 11:17:23 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-10-02 11:17:23 +0000 |
commit | 50c7751b606ac0568e531301149db404717d4717 (patch) | |
tree | 3a34aaf930071134945c07cdc7cabcc920588fe8 /win32 | |
parent | 77a6c82eabe113802a52bf77b8b8a0bcfe1f28f4 (diff) | |
download | bundler-50c7751b606ac0568e531301149db404717d4717.tar.gz |
* win32/win32.c (init_env): refactoring. remove unused code.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13599 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r-- | win32/win32.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/win32/win32.c b/win32/win32.c index ce13650cfd..99199c95af 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -372,19 +372,16 @@ init_env(void) SetEnvironmentVariable("HOME", env); } } - if (GetEnvironmentVariable("USER", env, sizeof env)) { - len = strlen(env); - } - if (GetEnvironmentVariable("USERNAME", env, sizeof env)) { - len = strlen(env); - SetEnvironmentVariable("USER", env); - } - else if (GetUserName(env, (len = sizeof env, &len))) { - SetEnvironmentVariable("USER", env); - } - else { - NTLoginName = "<Unknown>"; - return; + + if (!GetEnvironmentVariable("USER", env, sizeof env)) { + if (GetEnvironmentVariable("USERNAME", env, sizeof env) || + GetUserName(env, (len = sizeof env, &len))) { + SetEnvironmentVariable("USER", env); + } + else { + NTLoginName = "<Unknown>"; + return; + } } NTLoginName = strdup(env); } |