nobu	2008-06-12 02:25:57 +0900 (Thu, 12 Jun 2008)

  New Revision: 17100

  Modified files:
    trunk/ChangeLog
    trunk/io.c
    trunk/test/ruby/test_io.rb
    trunk/version.h

  Log:
    * io.c (rb_io_reopen): clear read buffer.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=17100&r2=17099&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/test/ruby/test_io.rb?r1=17100&r2=17099&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17100&r2=17099&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/io.c?r1=17100&r2=17099&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17099)
+++ ChangeLog	(revision 17100)
@@ -1,3 +1,7 @@
+Thu Jun 12 02:25:54 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (rb_io_reopen): clear read buffer.
+
 Thu Jun 12 00:56:20 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* ext/tk: check proper conditions.  [ruby-dev:35047]
Index: io.c
===================================================================
--- io.c	(revision 17099)
+++ io.c	(revision 17100)
@@ -4463,6 +4463,7 @@
     if (fptr->mode & FMODE_WRITABLE) {
         io_fflush(fptr);
     }
+    fptr->rbuf_off = fptr->rbuf_len = 0;
 
     if (fptr->stdio_file) {
         if (freopen(fptr->path, mode, fptr->stdio_file) == 0) {
Index: version.h
===================================================================
--- version.h	(revision 17099)
+++ version.h	(revision 17100)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-06-11"
+#define RUBY_RELEASE_DATE "2008-06-12"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080611
+#define RUBY_RELEASE_CODE 20080612
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_DAY 12
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: test/ruby/test_io.rb
===================================================================
--- test/ruby/test_io.rb	(revision 17099)
+++ test/ruby/test_io.rb	(revision 17100)
@@ -1038,6 +1038,14 @@
         safe_4 { r.reopen(t.path) }
       end
     end
+
+    open(__FILE__) do |f|
+      f.gets
+      assert_nothing_raised {
+        f.reopen(t.path)
+        assert_equal("foo\n", f.gets)
+      }
+    end
   end
 
   def test_foreach

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