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: copy in binary mode

Browse source 
* io.c (copy_stream_body): should write in binary mode.  based on a
  patch by godfat (Lin Jen-Shin) at [ruby-core:56556].
  [ruby-core:56518] [Bug #8767]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-08-27 08:03:00 +00:00
parent 1e238c5aa2
commit 8ef0192103
3 changed files with 53 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
Tue Aug 27 17:02:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (copy_stream_body): should write in binary mode. based on a
patch by godfat (Lin Jen-Shin) at [ruby-core:56556].
[ruby-core:56518] [Bug #8767]
Tue Aug 27 17:02:33 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (copy_stream_body): move common open flags.
Tue Aug 27 16:56:50 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Tue Aug 27 16:56:50 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* enumerator.c (enumerator_size): use rb_check_funcall() instead of * enumerator.c (enumerator_size): use rb_check_funcall() instead of

4
io.c
View file

@ -10229,9 +10229,9 @@ copy_stream_body(VALUE arg)
#ifdef O_BINARY #ifdef O_BINARY
if (src_fptr) if (src_fptr)
SET_BINARY_MODE_WITH_SEEK_CUR(src_fptr); SET_BINARY_MODE_WITH_SEEK_CUR(src_fptr);
if (dst_fptr)
setmode(dst_fd, O_BINARY);
#endif #endif
if (dst_fptr)
rb_io_ascii8bit_binmode(dst_io);
if (stp->src_offset == (off_t)-1 && src_fptr && src_fptr->rbuf.len) { if (stp->src_offset == (off_t)-1 && src_fptr && src_fptr->rbuf.len) {
size_t len = src_fptr->rbuf.len; size_t len = src_fptr->rbuf.len;

41
test/ruby/test_io.rb
View file

@ -857,6 +857,47 @@ class TestIO < Test::Unit::TestCase
} }
end end
def test_copy_stream_write_in_binmode
bug8767 = '[ruby-core:56518] [Bug #8767]'
mkcdtmpdir {
EnvUtil.with_default_internal(Encoding::UTF_8) do
# StringIO to object with to_path
bytes = "\xDE\xAD\xBE\xEF".force_encoding(Encoding::ASCII_8BIT)
src = StringIO.new(bytes)
dst = Object.new
def dst.to_path
"qux"
end
assert_nothing_raised(bug8767) {
IO.copy_stream(src, dst)
}
assert_equal(bytes, File.binread("qux"), bug8767)
assert_equal(4, src.pos, bug8767)
end
}
end
def test_copy_stream_read_in_binmode
bug8767 = '[ruby-core:56518] [Bug #8767]'
mkcdtmpdir {
EnvUtil.with_default_internal(Encoding::UTF_8) do
# StringIO to object with to_path
bytes = "\xDE\xAD\xBE\xEF".force_encoding(Encoding::ASCII_8BIT)
File.binwrite("qux", bytes)
dst = StringIO.new
src = Object.new
def src.to_path
"qux"
end
assert_nothing_raised(bug8767) {
IO.copy_stream(src, dst)
}
assert_equal(bytes, dst.string.b, bug8767)
assert_equal(4, dst.pos, bug8767)
end
}
end
class Rot13IO class Rot13IO
def initialize(io) def initialize(io)
@io = io @io = io