diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-12 13:56:51 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-12 13:56:51 +0000 |
commit | c1ca04ec6156e79ffafc80e2bf267130260c3ddb (patch) | |
tree | 7debaea6bd75aa555d80fb859423b69c2e87c678 /io.c | |
parent | d2f1bfba140ed2e98919adc087c8ac4ad0d1c8e6 (diff) | |
download | ruby-c1ca04ec6156e79ffafc80e2bf267130260c3ddb.tar.gz ruby-c1ca04ec6156e79ffafc80e2bf267130260c3ddb.tar.xz ruby-c1ca04ec6156e79ffafc80e2bf267130260c3ddb.zip |
merges r23853 from trunk into ruby_1_9_1.
--
* io.c (argf_binmode_m): should call rb_io_ascii8bit_binmode() to
set its encoding to ASCII-8BIT. [ruby-core:24029]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r-- | io.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -6236,7 +6236,7 @@ argf_next_argv(VALUE argf) } ARGF.current_file = prep_io(fr, FMODE_READABLE, rb_cFile, fn); } - if (ARGF.binmode) rb_io_binmode(ARGF.current_file); + if (ARGF.binmode) rb_io_ascii8bit_binmode(ARGF.current_file); if (ARGF.encs.enc) { rb_io_t *fptr; @@ -8279,7 +8279,8 @@ argf_binmode_m(VALUE argf) ARGF.binmode = 1; next_argv(); ARGF_FORWARD(0, 0); - rb_io_binmode(ARGF.current_file); + rb_io_ascii8bit_binmode(ARGF.current_file); + return argf; } |