* 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/trunk@23853 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · Jun 25, 2009 · 06e3782 · 06e3782
1 parent f119033
commit 06e3782
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Jun 25 17:58:39 2009  Yukihiro Matsumoto  <[email protected]>
+
+	* 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  <[email protected]>
 
 	* instruby.rb: '&' in sed s command's replacement is '\&' in ruby.

diff --git a/io.c b/io.c
@@ -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;
 }