* io.c (rb_io_oflags_modestr): return "r" for O_RDONLY|O_APPEND.

[ruby-dev:40379] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26644 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
lann · Feb 11, 2010 · c09bcd3 · c09bcd3
1 parent e95a439
commit c09bcd3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Feb 11 20:43:00 2010  Tanaka Akira  <[email protected]>
+
+	* io.c (rb_io_oflags_modestr): return "r" for O_RDONLY|O_APPEND.
+	  [ruby-dev:40379]
+
 Thu Feb 11 19:19:21 2010  Kazuhiro NISHIYAMA  <[email protected]>
 
 	* missing/alloca.c: s/RUBY_LIB/RUBY_LIB_PREFIX/ [ruby-dev:40395]

diff --git a/io.c b/io.c
@@ -4111,11 +4111,14 @@ rb_io_oflags_modestr(int oflags)
 #else
 # define MODE_BINARY(a,b) (a)
 #endif
+    int accmode = oflags & (O_RDONLY|O_WRONLY|O_RDWR);
     if (oflags & O_APPEND) {
-	if ((oflags & 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 (oflags & (O_RDONLY|O_WRONLY|O_RDWR)) {
       case O_RDONLY: