summaryrefslogtreecommitdiff
path: root/io.c
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-11 11:45:56 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-02-11 11:45:56 +0000
commita3742530e8fa768bb127b519f9be0525cd64428b (patch)
tree3878b4b78ae5998e92847d3ff2823f8a6b741ae8 /io.c
parentebf65d90c61098aae7f919e5cb635cfc0ad8fa6b (diff)
* 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@26645 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/io.c b/io.c
index eeb6ec510f..9a6ddc9e5f 100644
--- a/io.c
+++ b/io.c
@@ -2910,13 +2910,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: