matz	2009-06-25 18:01:45 +0900 (Thu, 25 Jun 2009)

  New Revision: 23853

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=23853

  Log:
    * io.c (argf_binmode_m): should call rb_io_ascii8bit_binmode() to
      set its encoding to ASCII-8BIT.  [ruby-core:24029]

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 23852)
+++ ChangeLog	(revision 23853)
@@ -1,3 +1,8 @@
+Thu Jun 25 17:58:39 2009  Yukihiro Matsumoto  <matz@r...>
+
+	* 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@r...>
 
 	* instruby.rb: '&' in sed s command's replacement is '\&' in ruby.
Index: io.c
===================================================================
--- io.c	(revision 23852)
+++ io.c	(revision 23853)
@@ -6533,7 +6533,7 @@
 		}
 		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 = 1;
     next_argv();
     ARGF_FORWARD(0, 0);
-    rb_io_binmode(ARGF.current_file);
+    rb_io_ascii8bit_binmode(ARGF.current_file);
+
     return argf;
 }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/