diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-02 13:58:21 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-02-02 13:58:21 +0000 |
| commit | b366c72ae1523f7dc25766d6191f77cb96a0f844 (patch) | |
| tree | 73db6aa4dc79426cc7f1e748373388a2f14d189e /ext | |
| parent | 997f821a58a7295436e64443ab4bd1d550cd6919 (diff) | |
merge revision(s) r48360,r48364: [Backport #10493]
* 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/branches/ruby_2_1@49473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/etc/etc.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/etc/etc.c b/ext/etc/etc.c index 18d425a8bf..3d195e44c6 100644 --- a/ext/etc/etc.c +++ b/ext/etc/etc.c @@ -67,8 +67,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; } |