diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | io.c | 17 | ||||
| -rw-r--r-- | test/ruby/test_io.rb | 21 |
3 files changed, 35 insertions, 12 deletions
@@ -1,8 +1,13 @@ -Sun Apr 20 12:49:03 2008 Tanaka Akira <akr@fsij.org> +Sun Apr 20 13:55:37 2008 Tanaka Akira <akr@fsij.org> - * io.c (copy_stream_fallback): read directly (bypassing readpartial) + * io.c (copy_stream_fallback): write directly (bypassing write method) if possible. +Sun Apr 20 12:49:03 2008 Tanaka Akira <akr@fsij.org> + + * io.c (copy_stream_fallback): read directly (bypassing readpartial + method) if possible. + Sun Apr 20 04:45:13 2008 Tanaka Akira <akr@fsij.org> * io.c (copy_stream_body): use readpartial and write method for @@ -6579,7 +6579,7 @@ copy_stream_fallback_body(VALUE arg) while (1) { long numwrote; - long l = buflen < rest ? buflen : rest; + long l; if (stp->copy_length == (off_t)-1) { l = buflen; } @@ -6604,9 +6604,18 @@ copy_stream_fallback_body(VALUE arg) if (off != (off_t)-1) off += ss; } - n = rb_io_write(stp->dst, buf); - numwrote = NUM2LONG(n); - stp->total += numwrote; + if (stp->dst_fd == -1) { + n = rb_io_write(stp->dst, buf); + numwrote = NUM2LONG(n); + stp->total += numwrote; + } + else { + ssize_t ss; + numwrote = RSTRING_LEN(buf); + ss = copy_stream_write(stp, RSTRING_PTR(buf), numwrote); + if (ss == -1) + return Qnil; + } rest -= numwrote; } diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb index 1fa164566b..e0c3c3d964 100644 --- a/test/ruby/test_io.rb +++ b/test/ruby/test_io.rb @@ -424,25 +424,30 @@ class TestIO < Test::Unit::TestCase } end - def test_copy_stream_non_io + def test_copy_stream_fname_to_strio mkcdtmpdir {|d| - # filename to StringIO File.open("foo", "w") {|f| f << "abcd" } src = "foo" dst = StringIO.new ret = IO.copy_stream(src, dst, 3) assert_equal(3, ret) assert_equal("abc", dst.string) + } + end + def test_copy_stream_strio_to_fname + mkcdtmpdir {|d| # StringIO to filename src = StringIO.new("abcd") - ret = File.open("fooo", "w") {|dst| - IO.copy_stream(src, dst, 3) - } + ret = IO.copy_stream(src, "fooo", 3) assert_equal(3, ret) - assert_equal("abc", dst.string) + assert_equal("abc", File.read("fooo")) assert_equal(3, src.pos) + } + end + def test_copy_stream_io_to_strio + mkcdtmpdir {|d| # IO to StringIO File.open("bar", "w") {|f| f << "abcd" } File.open("bar") {|src| @@ -452,7 +457,11 @@ class TestIO < Test::Unit::TestCase assert_equal("abc", dst.string) assert_equal(3, src.pos) } + } + end + def test_copy_stream_strio_to_io + mkcdtmpdir {|d| # StringIO to IO src = StringIO.new("abcd") ret = File.open("baz", "w") {|dst| |