nobu	2008-09-04 10:33:47 +0900 (Thu, 04 Sep 2008)

  New Revision: 19115

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

  Log:
    * io.c (argf_next_argv, argf_set_encoding): copy struct wise.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19114)
+++ ChangeLog	(revision 19115)
@@ -1,3 +1,7 @@
+Thu Sep  4 10:33:43 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (argf_next_argv, argf_set_encoding): copy struct wise.
+
 Thu Sep  4 09:46:18 2008  Tanaka Akira  <akr@f...>
 
 	* io.c (rb_scan_open_args): follow rb_str_transcode change.
Index: io.c
===================================================================
--- io.c	(revision 19114)
+++ io.c	(revision 19115)
@@ -5883,10 +5883,7 @@
 		rb_io_t *fptr;
 
 		GetOpenFile(current_file, fptr);
-		fptr->encs.enc = argf_enc;
-		fptr->encs.enc2 = argf_enc2;
-		fptr->encs.flags = argf_ecflags;
-		fptr->encs.ecopts = argf_ecopts;
+		fptr->encs = ARGF.encs;
                 clear_codeconv(fptr);
 	    }
 	}
@@ -7563,10 +7560,7 @@
     }
     rb_io_set_encoding(argc, argv, current_file);
     GetOpenFile(current_file, fptr);
-    argf_enc = fptr->encs.enc;
-    argf_enc2 = fptr->encs.enc2;
-    argf_ecflags = fptr->encs.flags;
-    argf_ecopts = fptr->encs.ecopts;
+    ARGF.encs = fptr->encs;
     return argf;
 }
 

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