diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-14 19:41:32 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-03-14 19:41:32 +0000 |
commit | 32ed00ab188cf46d0d4bae116a48dac91731af32 (patch) | |
tree | f9e7dc3edc0e4ac9e6890ddae690c0f720a53437 | |
parent | ad130d3670bc9ef423ccf93c2b6988f988359b29 (diff) | |
download | ruby-32ed00ab188cf46d0d4bae116a48dac91731af32.tar.gz |
* io.c (rb_io_each_codepoint): read directly when readconv is
needed but internal encoding is not set. [ruby-core:28650]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 11 | ||||
-rw-r--r-- | test/ruby/test_io.rb | 10 |
3 files changed, 23 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Mon Mar 15 04:41:25 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * io.c (rb_io_each_codepoint): read directly when readconv is + needed but internal encoding is not set. [ruby-core:28650] + Mon Mar 15 04:18:31 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * tool/file2lastrev.rb (VCS::{SVN,GIT}#get_revisions): @@ -2895,9 +2895,14 @@ rb_io_each_codepoint(VALUE io) rb_enc_name(fptr->encs.enc)); } n = MBCLEN_CHARFOUND_LEN(r); - c = rb_enc_codepoint(fptr->cbuf+fptr->cbuf_off, - fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len, - fptr->encs.enc); + if (fptr->encs.enc) { + c = rb_enc_codepoint(fptr->cbuf+fptr->cbuf_off, + fptr->cbuf+fptr->cbuf_off+fptr->cbuf_len, + fptr->encs.enc); + } + else { + c = (unsigned char)fptr->cbuf[fptr->cbuf_off]; + } fptr->cbuf_off += n; fptr->cbuf_len -= n; rb_yield(UINT2NUM(c)); diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 5fc3b133dd..a8860e1654 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -150,6 +150,16 @@ class TestIO < Test::Unit::TestCase r.close end + def test_each_codepoint + t = make_tempfile + bug2959 = '[ruby-core:28650]' + a = "" + File.open(t, 'rt') {|f| + f.each_codepoint {|c| a << c} + } + assert_equal("foo\nbar\nbaz\n", a, bug2959) + end + def test_rubydev33072 assert_raise(Errno::ENOENT, "[ruby-dev:33072]") do File.read("empty", nil, nil, {}) |