diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | io.c | 5 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Jun 25 17:58:39 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * io.c (argf_binmode_m): should call rb_io_ascii8bit_binmode() to + set its encoding to ASCII-8BIT. [ruby-core:24029] + Thu Jun 25 13:04:58 2009 NAKAMURA Usaku <usa@ruby-lang.org> * instruby.rb: '&' in sed s command's replacement is '\&' in ruby. @@ -6533,7 +6533,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; @@ -8604,7 +8604,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; } |