Skip to content

Commit

Permalink
* win32/win32.c (init_env): use _wputenv() instead of
Browse files Browse the repository at this point in the history
  SetEnvironmentVariableW() because latter doesn't set msvcrt's environ
  work area, of course.
  [Bug ruby#2552]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26296 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
unak committed Jan 12, 2010
1 parent 37ce3f6 commit 4301bbb
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 3 deletions.
7 changes: 7 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Tue Jan 12 14:53:07 2010 NAKAMURA Usaku <[email protected]>

* win32/win32.c (init_env): use _wputenv() instead of
SetEnvironmentVariableW() because latter doesn't set msvcrt's environ
work area, of course.
[Bug #2552]

Tue Jan 12 13:33:54 2010 NAKAMURA Usaku <[email protected]>

* file.c (realpath_rec): trace symbolic link only when supporting
Expand Down
13 changes: 10 additions & 3 deletions win32/win32.c
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ init_env(void)
{
static const WCHAR TMPDIR[] = L"TMPDIR";
WCHAR env[_MAX_PATH];
WCHAR *buf;
DWORD len;
BOOL f;

Expand All @@ -458,7 +459,9 @@ init_env(void)
}
if (f) {
regulate_path(env);
SetEnvironmentVariableW(L"HOME", env);
buf = ALLOCA_N(WCHAR, 5 + lstrlenW(env) + 1);
wsprintfW(buf, L"HOME=%s", env);
_wputenv(buf);
}
}

Expand All @@ -468,7 +471,9 @@ init_env(void)
NTLoginName = "<Unknown>";
return;
}
SetEnvironmentVariableW(L"USER", env);
buf = ALLOCA_N(WCHAR, 5 + lstrlenW(env) + 1);
wsprintfW(buf, L"USER=%s", env);
_wputenv(buf);
}
NTLoginName = strdup(rb_w32_getenv("USER"));

Expand All @@ -482,7 +487,9 @@ init_env(void)
if (*(p - 1) != L'/') *p++ = L'/';
if (p - env + numberof(temp) < numberof(env)) {
memcpy(p, temp, sizeof(temp));
SetEnvironmentVariableW(TMPDIR, env);
buf = ALLOCA_N(WCHAR, lstrlenW(TMPDIR) + 1 + lstrlenW(env) + 1);
wsprintfW(buf, L"%s=%s", TMPDIR, env);
_wputenv(buf);
}
}
}
Expand Down

0 comments on commit 4301bbb

Please sign in to comment.