From c1ca04ec6156e79ffafc80e2bf267130260c3ddb Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 12 Jul 2009 13:56:51 +0000 Subject: 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 --- ChangeLog | 5 +++++ io.c | 5 +++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 56cb9ded5..a2959b8a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Jun 25 17:58:39 2009 Yukihiro Matsumoto + + * io.c (argf_binmode_m): should call rb_io_ascii8bit_binmode() to + set its encoding to ASCII-8BIT. [ruby-core:24029] + Thu Jun 25 06:25:49 2009 Yukihiro Matsumoto * enum.c (first_i): wrong condition for no argument #first. diff --git a/io.c b/io.c index 0826ec0c9..76e9e949d 100644 --- a/io.c +++ b/io.c @@ -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; } diff --git a/version.h b/version.h index 79631a1ae..787abcc01 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "1.9.1" #define RUBY_RELEASE_DATE "2009-06-25" -#define RUBY_PATCHLEVEL 205 +#define RUBY_PATCHLEVEL 206 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 -- cgit