archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 08:33:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

string.c: respect BOM

Browse source 
* string.c (get_encoding): respect BOM on pseudo encodings.
  [ruby-dev:47895] [Bug #9415]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-01-15 05:04:36 +00:00
parent 77ae7b2e83
commit 6951fbca43
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
string.c
View file

@ -121,7 +121,7 @@ VALUE rb_cSymbol;
#define STR_HEAP_PTR(str) (RSTRING(str)->as.heap.ptr)
#define STR_HEAP_SIZE(str) (RSTRING(str)->as.heap.aux.capa + TERM_LEN(str))
#define STR_ENC_GET(str) rb_enc_from_index(ENCODING_GET(str))
#define STR_ENC_GET(str) get_encoding(str)
rb_encoding *rb_enc_get_from_index(int index);
@ -155,6 +155,12 @@ get_actual_encoding(const int encidx, VALUE str)
return rb_enc_from_index(encidx);
}
static rb_encoding *
get_encoding(VALUE str)
{
return get_actual_encoding(ENCODING_GET(str), str);
}
static int fstring_cmp(VALUE a, VALUE b);
static st_table* frozen_strings;