diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-10 08:24:36 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-11-10 08:24:36 +0000 |
| commit | 6ccf3d68c21c2eabefe80f9ff1f7b5296a9ddfd2 (patch) | |
| tree | d4067ab10ba5b3b857388b3e7f2dbb69e4d41c8f | |
| parent | e899fb19e9a845108c264ecc0e0542d68ce97fe7 (diff) | |
| download | ruby-6ccf3d68c21c2eabefe80f9ff1f7b5296a9ddfd2.tar.gz | |
win32.c: login name encoding
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/etc/etc.c | 11 | ||||
| -rw-r--r-- | test/etc/test_etc.rb | 4 | ||||
| -rw-r--r-- | win32/win32.c | 7 |
4 files changed, 21 insertions, 6 deletions
@@ -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> * lib/rubygems/*.rb: Update to RubyGems master(3e36528). diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 694ef5e17f..4173d33bdc 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -81,8 +81,15 @@ etc_getlogin(VALUE obj) login = getenv("USER"); #endif - if (login) - return rb_tainted_str_new2(login); + if (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; } diff --git a/test/etc/test_etc.rb b/test/etc/test_etc.rb index 2f61ac7919..374b379fc4 100644 --- a/test/etc/test_etc.rb +++ b/test/etc/test_etc.rb @@ -4,7 +4,9 @@ require "etc" class TestEtc < Test::Unit::TestCase def test_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 def test_passwd diff --git a/win32/win32.c b/win32/win32.c index 61872e997a..9f80d3228d 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -546,11 +546,12 @@ init_env(void) if (!GetEnvironmentVariableW(L"USERNAME", env, numberof(env)) && !GetUserNameW(env, (len = numberof(env), &len))) { 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)) && !GetEnvironmentVariableW(L"TMP", env, numberof(env)) && |