diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | io.c | 2 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 16 |
3 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,10 @@ +Sat Mar 6 10:03:35 2010 Yusuke Endoh <mame@tsg.ne.jp> + + * io.c (rb_io_s_binwrite): use mode "r+b" instead of "ab" to handle + offset correctly. [ruby-core:28517] + + * test/ruby/test_io.rb: use assert_equal instead of assert. + Sat Mar 6 01:08:54 2010 NAKAMURA Usaku <usa@ruby-lang.org> * win32/Makefile.sub (config.h): VC6 has __int64. @@ -8025,7 +8025,7 @@ rb_io_s_binwrite(int argc, VALUE *argv, VALUE io) rb_scan_args(argc, argv, "21", NULL, &warg.str, &offset); if (!NIL_P(offset)) { NUM2OFFT(offset); - mode = "ab:ASCII-8BIT"; + mode = "r+b:ASCII-8BIT"; } else { mode = "wb:ASCII-8BIT"; diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 6ea128a880..cab270d447 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -1518,13 +1518,13 @@ End path = t.path t.close(false) File.write(path, "foo\nbar\nbaz") - assert("foo\nbar\nbaz", File.read(path)) + assert_equal("foo\nbar\nbaz", File.read(path)) File.write(path, "FOO", 0) - assert("FOO\nbar\nbaz", File.read(path)) + assert_equal("FOO\nbar\nbaz", File.read(path)) File.write(path, "BAR") - assert("BAR", File.read(path)) + assert_equal("BAR", File.read(path)) File.write(path, "\u{3042}", mode: "w", encoding: "EUC-JP") - assert("\u{3042}".encode("EUC-JP"), File.read(path, encoding: "EUC-JP")) + assert_equal("\u{3042}".encode("EUC-JP"), File.read(path, encoding: "EUC-JP")) t.unlink end @@ -1533,13 +1533,13 @@ End path = t.path t.close(false) File.binwrite(path, "foo\nbar\nbaz") - assert("foo\nbar\nbaz", File.read(path)) + assert_equal("foo\nbar\nbaz", File.read(path)) File.binwrite(path, "FOO", 0) - assert("FOO\nbar\nbaz", File.read(path)) + assert_equal("FOO\nbar\nbaz", File.read(path)) File.binwrite(path, "BAR") - assert("BAR", File.read(path)) + assert_equal("BAR", File.read(path)) File.binwrite(path, "\u{3042}") - assert("\u{3042}", File.read(path, encoding: "EUC-JP")) + assert_equal("\u{3042}", File.read(path)) t.unlink end end |