merge revision(s) 26645:

	* io.c (rb_io_modenum_mode): return "r" for O_RDONLY|O_APPEND.
	  [ruby-dev:40379]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@27957 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index b899d79241..469f730e39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat May 22 21:03:16 2010  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_io_modenum_mode): return "r" for O_RDONLY|O_APPEND.
+	  [ruby-dev:40379]
+
 Sat May 22 20:51:39 2010  URABE Shyouhei  <shyouhei@ruby-lang.org>
 
 	* lib/resolv.rb (Resolv::DNS::Config#nameserver_port): 1.8.7
diff --git a/io.c b/io.c
index 1b5aa68c72..d46d276a1a 100644
--- a/io.c
+++ b/io.c
@@ -2893,13 +2893,16 @@ rb_io_modenum_mode(flags)
 #else
 # define MODE_BINARY(a,b) (a)
 #endif
+    int accmode = flags & O_ACCMODE;
     if (flags & O_APPEND) {
-	if ((flags & O_RDWR) == O_RDWR) {
+	if (accmode == O_WRONLY) {
+            return MODE_BINARY("a", "ab");
+        }
+	if (accmode == O_RDWR) {
 	    return MODE_BINARY("a+", "ab+");
 	}
-	return MODE_BINARY("a", "ab");
     }
-    switch (flags & (O_RDONLY|O_WRONLY|O_RDWR)) {
+    switch (accmode) {
       case O_RDONLY:
 	return MODE_BINARY("r", "rb");
       case O_WRONLY:
diff --git a/version.h b/version.h
index c25742ec63..8f4d222d19 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-05-22"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20100522
-#define RUBY_PATCHLEVEL 262
+#define RUBY_PATCHLEVEL 263
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8