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

hash.c: refactor env_enc_str_new

Browse source 
* hash.c (env_enc_str_new): convert to the expected encoding
  without intermediate string, and set econv flags if default
  internal encoding is set too.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2017-07-30 02:56:30 +00:00
parent 8458e709ab
commit f9d5843fd9
1 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
hash.c
View file

@ -3168,27 +3168,17 @@ extern char **environ;
#define ENVNMATCH(s1, s2, n) (memcmp((s1), (s2), (n)) == 0) #define ENVNMATCH(s1, s2, n) (memcmp((s1), (s2), (n)) == 0)
#endif #endif
#ifdef _WIN32
static VALUE
env_str_transcode(VALUE str, rb_encoding *enc)
{
rb_encoding *internal = rb_default_internal_encoding();
if (!internal) {
return rb_str_conv_enc_opts(str, NULL, enc,
ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE,
Qnil);
}
else {
return rb_external_str_with_enc(str, rb_utf8_encoding());
}
}
#endif
static VALUE static VALUE
env_enc_str_new(const char *ptr, long len, rb_encoding *enc) env_enc_str_new(const char *ptr, long len, rb_encoding *enc)
{ {
#ifdef _WIN32 #ifdef _WIN32
VALUE str = env_str_transcode(rb_utf8_str_new(ptr, len), enc); rb_encoding *internal = rb_default_internal_encoding();
const int ecflags = ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE;
rb_encoding *utf8 = rb_utf8_encoding();
VALUE str = rb_enc_str_new(NULL, 0, (internal ? internal : enc));
if (NIL_P(rb_str_cat_conv_enc_opts(str, 0, ptr, len, utf8, ecflags, Qnil))) {
rb_str_initialize(str, ptr, len, utf8);
}
#else #else
VALUE str = rb_external_str_new_with_enc(ptr, len, enc); VALUE str = rb_external_str_new_with_enc(ptr, len, enc);
#endif #endif