1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

win32.c: login name encoding

Browse Source 
* ext/etc/etc.c (etc_getlogin): set login name encoding properly.
  [ruby-core:66163] [Bug #10493]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48360 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-11-10 08:24:36 +00:00
parent e899fb19e9
commit 6ccf3d68c2
4 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Nov 10 17:24:34 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/etc/etc.c (etc_getlogin): set login name encoding properly.
[ruby-core:66163] [Bug #10493]
Mon Nov 10 16:20:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Mon Nov 10 16:20:42 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/rubygems/*.rb: Update to RubyGems master(3e36528). * lib/rubygems/*.rb: Update to RubyGems master(3e36528).

11
ext/etc/etc.c
View File

@ -81,8 +81,15 @@ etc_getlogin(VALUE obj)
login = getenv("USER"); login = getenv("USER");
#endif #endif
if (login) if (login) {
return rb_tainted_str_new2(login); #ifdef _WIN32
rb_encoding *extenc = rb_utf8_encoding();
#else
rb_encoding *extenc = rb_locale_encoding();
#endif
return rb_external_str_new_with_enc(login, strlen(login), extenc);
}
return Qnil; return Qnil;
} }

4
test/etc/test_etc.rb
View File

@ -4,7 +4,9 @@ require "etc"
class TestEtc < Test::Unit::TestCase class TestEtc < Test::Unit::TestCase
def test_getlogin def test_getlogin
s = Etc.getlogin s = Etc.getlogin
assert(s.is_a?(String) || s == nil, "getlogin must return a String or nil") return if s == nil
assert(s.is_a?(String), "getlogin must return a String or nil")
assert_predicate(s, :valid_encoding?, "login name should be a valid string")
end end
def test_passwd def test_passwd

7
win32/win32.c
View File

@ -546,11 +546,12 @@ init_env(void)
if (!GetEnvironmentVariableW(L"USERNAME", env, numberof(env)) && if (!GetEnvironmentVariableW(L"USERNAME", env, numberof(env)) &&
!GetUserNameW(env, (len = numberof(env), &len))) { !GetUserNameW(env, (len = numberof(env), &len))) {
NTLoginName = "<Unknown>"; NTLoginName = "<Unknown>";
return;
} }
set_env_val(L"USER"); else {
set_env_val(L"USER");
NTLoginName = rb_w32_wstr_to_mbstr(CP_UTF8, env, -1, NULL);
}
} }
NTLoginName = strdup(rb_w32_getenv("USER"));
if (!GetEnvironmentVariableW(TMPDIR, env, numberof(env)) && if (!GetEnvironmentVariableW(TMPDIR, env, numberof(env)) &&
!GetEnvironmentVariableW(L"TMP", env, numberof(env)) && !GetEnvironmentVariableW(L"TMP", env, numberof(env)) &&