diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 14:57:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 14:57:34 +0000 |
| commit | d22c7396d62cac5ba6fe33f9ddd04fa0f0481cf9 (patch) | |
| tree | 4831c7fccec7b28c8fe2310ce7a42afebcc0b716 /encoding.c | |
| parent | dd38dc1e81a46a0b6d8940b06a4368a391132687 (diff) | |
| download | ruby-d22c7396d62cac5ba6fe33f9ddd04fa0f0481cf9.tar.gz ruby-d22c7396d62cac5ba6fe33f9ddd04fa0f0481cf9.tar.xz ruby-d22c7396d62cac5ba6fe33f9ddd04fa0f0481cf9.zip | |
* encoding.c (rb_locale_charmap): fallback to codepage if no
locale is found. [ruby-core:21110]
* missing/langinfo.c (nl_langinfo_codeset): returns NULL if no
locale is found.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21511 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/encoding.c b/encoding.c index 6c70c7413..858f4e70e 100644 --- a/encoding.c +++ b/encoding.c @@ -1218,6 +1218,15 @@ rb_locale_charmap(VALUE klass) { #if defined NO_LOCALE_CHARMAP return rb_usascii_str_new2("ASCII-8BIT"); +#elif defined __CYGWIN__ + const char *nl_langinfo_codeset(void); + const char *codeset = nl_langinfo_codeset(); + char cp[sizeof(int) * 3 + 4]; + if (codeset) { + snprintf(cp, sizeof(cp), "CP%d", GetConsoleCP()); + codeset = cp; + } + return rb_usascii_str_new2(codeset); #elif defined HAVE_LANGINFO_H char *codeset; codeset = nl_langinfo(CODESET); |