diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-17 04:03:23 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-10-17 04:03:23 +0000 |
commit | 4bc884c4f38e9b5221fd66ffbcbcacac5a79719b (patch) | |
tree | dfdefaf163b16d0f70475d6aaa7d77dc212c5218 | |
parent | 34b877e49166c209e300ee9887f79b26b82821fc (diff) |
ruby.c: conflicting O_NONBLOCK
* ruby.c (load_file_internal): do not use O_NONBLOCK when
conflicting with O_ACCMODE.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | io.c | 2 | ||||
-rw-r--r-- | ruby.c | 8 |
2 files changed, 7 insertions, 3 deletions
@@ -4981,7 +4981,7 @@ rb_io_oflags_fmode(int oflags) { int fmode = 0; - switch (oflags & (O_RDONLY|O_WRONLY|O_RDWR)) { + switch (oflags & O_ACCMODE) { case O_RDONLY: fmode = FMODE_READABLE; break; @@ -43,6 +43,9 @@ #ifndef MAXPATHLEN # define MAXPATHLEN 1024 #endif +#ifndef O_ACCMODE +# define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR) +#endif #include "ruby/util.h" @@ -1739,9 +1742,10 @@ load_file_internal(VALUE arg) } else { int fd, mode = O_RDONLY; -#if defined O_NONBLOCK +#if defined O_NONBLOCK && !(O_NONBLOCK & O_ACCMODE) + /* TODO: fix conflicting O_NONBLOCK in ruby/win32.h */ mode |= O_NONBLOCK; -#elif defined O_NDELAY +#elif defined O_NDELAY && !(O_NDELAY & O_ACCMODE) mod |= O_NDELAY; #endif #if defined DOSISH || defined __CYGWIN__ |