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 | dfcb5cf957a24184a607638d1c0d4cb2368ac5ca (patch) | |
tree | 7debaea6bd75aa555d80fb859423b69c2e87c678 | |
parent | 01c53e458a2af3f4b2c59f462f026802146b7aba (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@24039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | io.c | 5 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 9 insertions, 3 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 06:25:49 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * enum.c (first_i): wrong condition for no argument #first. @@ -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; } @@ -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 |