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

1 files changed, 6 insertions, 3 deletions

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: