shyouhei	2009-03-09 09:52:15 +0900 (Mon, 09 Mar 2009)

  New Revision: 22836

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

  Log:
    merge revision(s) 21913:
    * io.c (io_getpartial): fflush after read for updating pos in FILE.
      not portable, I guess.  [ruby-core:21561]

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/io.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 22835)
+++ ruby_1_8_6/ChangeLog	(revision 22836)
@@ -1,3 +1,8 @@
+Mon Mar  9 09:51:19 2009  Tanaka Akira  <akr@f...>
+
+	* io.c (io_getpartial): fflush after read for updating pos in FILE.
+	  not portable, I guess.  [ruby-core:21561]
+
 Mon Mar  9 09:03:01 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* gc.c (define_final): cannot define finalizer for immediate
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 22835)
+++ ruby_1_8_6/version.h	(revision 22836)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-03-09"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090309
-#define RUBY_PATCHLEVEL 357
+#define RUBY_PATCHLEVEL 358
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/io.c
===================================================================
--- ruby_1_8_6/io.c	(revision 22835)
+++ ruby_1_8_6/io.c	(revision 22836)
@@ -1275,6 +1275,8 @@
                 goto again;
             rb_sys_fail(fptr->path);
         }
+        if (fptr->f) /* update pos in FILE structure [ruby-core:21561] */
+            fflush(fptr->f);
     }
     rb_str_resize(str, n);
 

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