Skip to content

Commit

Permalink
Supported BOM
Browse files Browse the repository at this point in the history
  • Loading branch information
nobu committed Aug 14, 2019
1 parent 53def32 commit b249631
Show file tree
Hide file tree
Showing 2 changed files with 95 additions and 0 deletions.
81 changes: 81 additions & 0 deletions ext/stringio/stringio.c
Expand Up @@ -262,6 +262,73 @@ strio_initialize(int argc, VALUE *argv, VALUE self)
return strio_init(argc, argv, ptr, self);
}

static int
detect_bom(VALUE str, int *bomlen)
{
const char *p;
long len;

RSTRING_GETMEM(str, p, len);
if (len < 1) return 0;
switch ((unsigned char)p[0]) {
case 0xEF:
if (len < 2) break;
if ((unsigned char)p[1] == 0xBB && len > 2) {
if ((unsigned char)p[2] == 0xBF) {
*bomlen = 3;
return rb_utf8_encindex();
}
}
break;

case 0xFE:
if (len < 2) break;
if ((unsigned char)p[1] == 0xFF) {
*bomlen = 2;
return rb_enc_find_index("UTF-16BE");
}
break;

case 0xFF:
if (len < 2) break;
if ((unsigned char)p[1] == 0xFE) {
if (len >= 4 && (unsigned char)p[2] == 0 && (unsigned char)p[3] == 0) {
*bomlen = 4;
return rb_enc_find_index("UTF-32LE");
}
*bomlen = 2;
return rb_enc_find_index("UTF-16LE");
}
break;

case 0:
if (len < 4) break;
if ((unsigned char)p[1] == 0 && (unsigned char)p[2] == 0xFE & (unsigned char)p[3] == 0xFF) {

This comment has been minimized.

Copy link
@shyouhei

shyouhei Aug 23, 2019

Member

& is arguably a bug.

This comment has been minimized.

Copy link
@nobu

nobu Aug 23, 2019

Author Member

Indeed, even if it makes no difference due to the precedence.

*bomlen = 4;
return rb_enc_find_index("UTF-32BE");
}
break;
}
return 0;
}

static rb_encoding *
set_encoding_by_bom(struct StringIO *ptr)
{
int bomlen, idx = detect_bom(ptr->string, &bomlen);
rb_encoding *extenc = NULL;

if (idx) {
extenc = rb_enc_from_index(idx);
ptr->pos = bomlen;
if (ptr->flags & FMODE_WRITABLE) {
rb_enc_associate_index(ptr->string, idx);
}
}
ptr->enc = extenc;
return extenc;
}

static VALUE
strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
{
Expand Down Expand Up @@ -294,6 +361,7 @@ strio_init(int argc, VALUE *argv, struct StringIO *ptr, VALUE self)
ptr->enc = convconfig.enc;
ptr->pos = 0;
ptr->lineno = 0;
if (ptr->flags & FMODE_SETENC_BY_BOM) set_encoding_by_bom(ptr);
RBASIC(self)->flags |= (ptr->flags & FMODE_READWRITE) * (STRIO_READABLE / FMODE_READABLE);
return self;
}
Expand Down Expand Up @@ -1677,6 +1745,18 @@ strio_set_encoding(int argc, VALUE *argv, VALUE self)
return self;
}

static VALUE
strio_set_encoding_by_bom(VALUE self)
{
struct StringIO *ptr = StringIO(self);

if (ptr->enc) {
rb_raise(rb_eArgError, "encoding conversion is set");
}
if (!set_encoding_by_bom(ptr)) return Qnil;
return rb_enc_from_encoding(ptr->enc);
}

/*
* Pseudo I/O on String object.
*
Expand Down Expand Up @@ -1778,6 +1858,7 @@ Init_stringio(void)
rb_define_method(StringIO, "external_encoding", strio_external_encoding, 0);
rb_define_method(StringIO, "internal_encoding", strio_internal_encoding, 0);
rb_define_method(StringIO, "set_encoding", strio_set_encoding, -1);
rb_define_method(StringIO, "set_encoding_by_bom", strio_set_encoding_by_bom, 0);

{
VALUE mReadable = rb_define_module_under(rb_cIO, "generic_readable");
Expand Down
14 changes: 14 additions & 0 deletions test/stringio/test_stringio.rb
Expand Up @@ -795,6 +795,20 @@ def test_encoding_read
assert_equal("\0\0\0a\0\0\0b\0\0\0c", s.read)
end

%w/UTF-8 UTF-16BE UTF-16LE UTF-32BE UTF-32LE/.each do |name|
define_method("test_strip_bom:#{name}") do
text = "\uFEFF\u0100a"
content = text.encode(name)
result = StringIO.new(content, mode: 'rb:BOM|UTF-8').read
assert_equal(Encoding.find(name), result.encoding, name)
assert_equal(content[1..-1].b, result.b, name)

StringIO.open(content) {|f|
assert_equal(Encoding.find(name), f.set_encoding_by_bom)
}
end
end

def assert_string(content, encoding, str, mesg = nil)
assert_equal([content, encoding], [str, str.encoding], mesg)
end
Expand Down

0 comments on commit b249631

Please sign in to comment.