kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

localeinit.c: locale_charmap return value

Browse source 
* 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
This commit is contained in:
nobu 2017-03-30 15:20:52 +00:00
parent f88521bb39
commit 44fa00eead
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
localeinit.c
View file

@ -23,13 +23,20 @@
#define CP_FORMAT(buf, codepage) snprintf(buf, sizeof(buf), "CP%u", (codepage)) #define CP_FORMAT(buf, codepage) snprintf(buf, sizeof(buf), "CP%u", (codepage))
#endif #endif
#ifndef NO_LOCALE_CHARMAP
# if defined _WIN32 || defined __CYGWIN__ || defined HAVE_LANGINFO_H
# define NO_LOCALE_CHARMAP 0
# else
# define NO_LOCALE_CHARMAP 1
# endif
#endif
#if !NO_LOCALE_CHARMAP
static VALUE static VALUE
locale_charmap(VALUE (*conv)(const char *)) 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; const char *codeset = 0;
#if defined _WIN32 || defined __CYGWIN__
char cp[SIZEOF_CP_NAME]; char cp[SIZEOF_CP_NAME];
# ifdef __CYGWIN__ # ifdef __CYGWIN__
const char *nl_langinfo_codeset(void); const char *nl_langinfo_codeset(void);
@ -41,15 +48,15 @@ locale_charmap(VALUE (*conv)(const char *))
CP_FORMAT(cp, codepage); CP_FORMAT(cp, codepage);
codeset = cp; codeset = cp;
} }
return (*conv)(codeset);
#elif defined HAVE_LANGINFO_H #elif defined HAVE_LANGINFO_H
char *codeset;
codeset = nl_langinfo(CODESET); codeset = nl_langinfo(CODESET);
return (*conv)(codeset); ASSUME(codeset);
#else #else
return ENCINDEX_US_ASCII; # error locale_charmap() is not implemented
#endif #endif
return (*conv)(codeset);
} }
#endif
/* /*
* call-seq: * call-seq:
@ -79,27 +86,37 @@ locale_charmap(VALUE (*conv)(const char *))
VALUE VALUE
rb_locale_charmap(VALUE klass) rb_locale_charmap(VALUE klass)
{ {
#if NO_LOCALE_CHARMAP
return rb_usascii_str_new_cstr("US-ASCII");
#else
return locale_charmap(rb_usascii_str_new_cstr); return locale_charmap(rb_usascii_str_new_cstr);
#endif
} }
#if !NO_LOCALE_CHARMAP
static VALUE static VALUE
enc_find_index(const char *name) enc_find_index(const char *name)
{ {
return (VALUE)rb_enc_find_index(name); return (VALUE)rb_enc_find_index(name);
} }
#endif
int int
rb_locale_charmap_index(void) rb_locale_charmap_index(void)
{ {
#if NO_LOCALE_CHARMAP
return ENCINDEX_US_ASCII;
#else
return (int)locale_charmap(enc_find_index); return (int)locale_charmap(enc_find_index);
#endif
} }
int int
Init_enc_set_filesystem_encoding(void) Init_enc_set_filesystem_encoding(void)
{ {
int idx; int idx;
#if defined NO_LOCALE_CHARMAP #if NO_LOCALE_CHARMAP
# error NO_LOCALE_CHARMAP defined idx = ENCINDEX_US_ASCII;
#elif defined _WIN32 #elif defined _WIN32
char cp[SIZEOF_CP_NAME]; char cp[SIZEOF_CP_NAME];
CP_FORMAT(cp, AreFileApisANSI() ? GetACP() : GetOEMCP()); CP_FORMAT(cp, AreFileApisANSI() ? GetACP() : GetOEMCP());