From 9350a57463472993535bbd42b5ac1828d233dde2 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Mon, 26 Oct 2009 03:06:29 +0000
Subject: [PATCH] * io.c (io_fwrite): adjust stdio file position after direct
 write on   BSDish platforms.   [ruby-core:26300]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25485 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog            |  5 +++++
 test/ruby/test_io.rb | 15 +++++++++++++++
 version.h            |  4 ++--
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0d194e58d9..e07e14020b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Oct 26 12:06:27 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_fwrite): adjust stdio file position after direct write on
+	  BSDish platforms.   [ruby-core:26300]
+
 Sun Oct 25 15:44:24 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* ext/dl/handle.c (dlhandle_sym): fixed an invalid local variable
diff --git a/test/ruby/test_io.rb b/test/ruby/test_io.rb
index 71f31e37a3..0052a9263c 100644
--- a/test/ruby/test_io.rb
+++ b/test/ruby/test_io.rb
@@ -1167,6 +1167,21 @@ class TestIO < Test::Unit::TestCase
     end
   end
 
+  def test_pos
+    t = make_tempfile
+
+    open(t.path, IO::RDWR|IO::CREAT|IO::TRUNC, 0600) do |f|
+      f.write "Hello"
+      assert_equal(5, f.pos)
+    end
+    open(t.path, IO::RDWR|IO::CREAT|IO::TRUNC, 0600) do |f|
+      f.sync = true
+      f.read
+      f.write "Hello"
+      assert_equal(5, f.pos)
+    end
+  end
+
   def test_sysseek
     t = make_tempfile
 
diff --git a/version.h b/version.h
index b5b670b8a7..493f6bd69b 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_RELEASE_DATE "2009-10-25"
+#define RUBY_RELEASE_DATE "2009-10-26"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 25
+#define RUBY_RELEASE_DAY 26
 
 #include "ruby/version.h"