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

* io.c (rb_io_tell): adjustment for ungotten data.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24782 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-09-07 08:23:00 +00:00
parent 5a12fb5fb8
commit a5c2f8843f
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Mon Sep 7 17:22:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (rb_io_tell): adjustment for ungotten data.
Mon Sep 7 17:13:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Sep 7 17:13:53 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (io_encname_bom_p): removed magic number. * io.c (io_encname_bom_p): removed magic number.

1
io.c
View file

@ -1042,6 +1042,7 @@ rb_io_tell(VALUE io)
GetOpenFile(io, fptr); GetOpenFile(io, fptr);
pos = io_tell(fptr); pos = io_tell(fptr);
if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv); if (pos < 0 && errno) rb_sys_fail_path(fptr->pathv);
pos -= fptr->rbuf_len;
return OFFT2NUM(pos); return OFFT2NUM(pos);
} }

6
test/ruby/test_io.rb
View file

@ -121,16 +121,22 @@ class TestIO < Test::Unit::TestCase
def test_ungetbyte def test_ungetbyte
t = make_tempfile t = make_tempfile
t.open t.open
t.binmode
t.ungetbyte(0x41) t.ungetbyte(0x41)
assert_equal(-1, t.pos)
assert_equal(0x41, t.getbyte) assert_equal(0x41, t.getbyte)
t.rewind t.rewind
assert_equal(0, t.pos)
t.ungetbyte("qux") t.ungetbyte("qux")
assert_equal(-3, t.pos)
assert_equal("quxfoo\n", t.gets) assert_equal("quxfoo\n", t.gets)
assert_equal(4, t.pos)
t.set_encoding("utf-8") t.set_encoding("utf-8")
t.ungetbyte(0x89) t.ungetbyte(0x89)
t.ungetbyte(0x8e) t.ungetbyte(0x8e)
t.ungetbyte("\xe7") t.ungetbyte("\xe7")
t.ungetbyte("\xe7\xb4\x85") t.ungetbyte("\xe7\xb4\x85")
assert_equal(-2, t.pos)
assert_equal("\u7d05\u7389bar\n", t.gets) assert_equal("\u7d05\u7389bar\n", t.gets)
end end