diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-30 15:20:52 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-30 15:20:52 +0000 |
| commit | 44fa00eeadf88aac3c7aab03f5c7d4773da5d92e () | |
| tree | 0ada95de3a5d89a810469e9e0a82f4044506be4f /localeinit.c | |
| parent | f88521bb394916b205dafa5da4d22dd92f960584 (diff) | |
localeinit.c: locale_charmap return value
* localeinit.c (locale_charmap): fix the return value to call conv function instead of encoding index on platforms where locale information is not available. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58221 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | localeinit.c | 35 |
1 files changed, 26 insertions, 9 deletions
@@ -23,13 +23,20 @@ #define CP_FORMAT(buf, codepage) snprintf(buf, sizeof(buf), "CP%u", (codepage)) #endif static VALUE locale_charmap(VALUE (*conv)(const char *)) { -#if defined NO_LOCALE_CHARMAP -# error NO_LOCALE_CHARMAP defined -#elif defined _WIN32 || defined __CYGWIN__ const char *codeset = 0; char cp[SIZEOF_CP_NAME]; # ifdef __CYGWIN__ const char *nl_langinfo_codeset(void); @@ -41,15 +48,15 @@ locale_charmap(VALUE (*conv)(const char *)) CP_FORMAT(cp, codepage); codeset = cp; } - return (*conv)(codeset); #elif defined HAVE_LANGINFO_H - char *codeset; codeset = nl_langinfo(CODESET); - return (*conv)(codeset); #else - return ENCINDEX_US_ASCII; #endif } /* * call-seq: @@ -79,27 +86,37 @@ locale_charmap(VALUE (*conv)(const char *)) VALUE rb_locale_charmap(VALUE klass) { return locale_charmap(rb_usascii_str_new_cstr); } static VALUE enc_find_index(const char *name) { return (VALUE)rb_enc_find_index(name); } int rb_locale_charmap_index(void) { return (int)locale_charmap(enc_find_index); } int Init_enc_set_filesystem_encoding(void) { int idx; -#if defined NO_LOCALE_CHARMAP -# error NO_LOCALE_CHARMAP defined #elif defined _WIN32 char cp[SIZEOF_CP_NAME]; CP_FORMAT(cp, AreFileApisANSI() ? GetACP() : GetOEMCP()); |