diff options
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 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; } |