1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (rb_cloexec_fcntl_dupfd): don't clear try_dupfd_cloexec if

Browse Source 
fcntl(F_DUPFD) failed as fcntl(F_DUPFD_CLOEXEC).



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33641 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-11-05 10:13:00 +00:00
parent a3521e0261
commit 333c847f19
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sat Nov 5 19:11:50 2011 Tanaka Akira <akr@fsij.org>
* io.c (rb_cloexec_fcntl_dupfd): don't clear try_dupfd_cloexec if
fcntl(F_DUPFD) failed as fcntl(F_DUPFD_CLOEXEC).
Sat Nov 5 18:05:12 2011 Tanaka Akira <akr@fsij.org> Sat Nov 5 18:05:12 2011 Tanaka Akira <akr@fsij.org>
* ext/socket/socket.c (rsock_socketpair0): refactored. * ext/socket/socket.c (rsock_socketpair0): refactored.

4
io.c
View File

@ -297,8 +297,10 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
} }
/* F_DUPFD_CLOEXEC is available since Linux 2.6.24. Linux 2.6.18 fails with EINVAL */ /* F_DUPFD_CLOEXEC is available since Linux 2.6.24. Linux 2.6.18 fails with EINVAL */
if (errno == EINVAL) { if (errno == EINVAL) {
try_dupfd_cloexec = 0;
ret = fcntl(fd, F_DUPFD, minfd); ret = fcntl(fd, F_DUPFD, minfd);
if (ret != -1) {
try_dupfd_cloexec = 0;
}
} }
} }
else { else {