akr	2008-08-26 00:37:04 +0900 (Tue, 26 Aug 2008)

  New Revision: 18851

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

  Log:
    * io.c (io_fwrite): add TEXTMODE_NEWLINE_ENCODER to option for
      rb_str_transcode.

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 18850)
+++ ChangeLog	(revision 18851)
@@ -1,3 +1,8 @@
+Tue Aug 26 00:36:01 2008  Tanaka Akira  <akr@f...>
+
+	* io.c (io_fwrite): add TEXTMODE_NEWLINE_ENCODER to option for
+	  rb_str_transcode.
+
 Tue Aug 26 00:24:23 2008  Tanaka Akira  <akr@f...>
 
 	* transcode.c (make_econv_exception): show readagain part for invalid
Index: io.c
===================================================================
--- io.c	(revision 18850)
+++ io.c	(revision 18851)
@@ -755,7 +755,12 @@
         }
 
         if (!NIL_P(common_encoding)) {
-            str = rb_str_transcode(str, common_encoding, &fptr->encs.opts);
+            rb_econv_option_t ecopts = fptr->encs.opts;
+#ifdef TEXTMODE_NEWLINE_ENCODER
+            if (NEED_NEWLINE_ENCODER(fptr))
+                ecopts.flags |= TEXTMODE_NEWLINE_ENCODER;
+#endif
+            str = rb_str_transcode(str, common_encoding, &ecopts);
         }
 
         if (fptr->writeconv) {

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