diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-20 15:53:14 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-10-20 15:53:14 +0000 |
commit | 7d48eab26035ea6ef10c14dcb3a01475ad861065 (patch) | |
tree | 5dcbb9b22675dc8d2ae6b02133ebf402506fad8a /io.c | |
parent | e46482f3d3dd64883b60911b12f627e9ceda3391 (diff) | |
download | ruby-7d48eab26035ea6ef10c14dcb3a01475ad861065.tar.gz |
* io.c (rb_io_ascii8bit_binmode): renamed from rb_io_binmode.
(rb_io_binmode): don't change encoding conversion.
(rb_io_binmode_m): call rb_io_ascii8bit_binmode.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19860 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -3503,7 +3503,22 @@ rb_io_binmode(VALUE io) rb_io_t *fptr; GetOpenFile(io, fptr); + if (fptr->readconv) + rb_econv_binmode(fptr->readconv); + if (fptr->writeconv) + rb_econv_binmode(fptr->writeconv); + fptr->mode |= FMODE_BINMODE; + fptr->mode &= ~FMODE_TEXTMODE; + fptr->writeconv_pre_ecflags &= ~(ECONV_UNIVERSAL_NEWLINE_DECORATOR|ECONV_CRLF_NEWLINE_DECORATOR|ECONV_CR_NEWLINE_DECORATOR); + return io; +} +static VALUE +rb_io_ascii8bit_binmode(VALUE io) +{ + rb_io_t *fptr; + + GetOpenFile(io, fptr); if (fptr->readconv) { rb_econv_close(fptr->readconv); fptr->readconv = NULL; @@ -3542,11 +3557,11 @@ rb_io_binmode_m(VALUE io) { VALUE write_io; - rb_io_binmode(io); + rb_io_ascii8bit_binmode(io); write_io = GetWriteIO(io); if (write_io != io) - rb_io_binmode(write_io); + rb_io_ascii8bit_binmode(write_io); return io; } |