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

* io.c (rb_cloexec_dup): don't allocate standard file descriptors.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-10-30 01:02:46 +00:00
parent e745a03cfa
commit f0b021c0ce
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Sun Oct 30 09:58:48 2011 Tanaka Akira <akr@fsij.org>
* io.c (rb_cloexec_dup): don't allocate standard file descriptors.
Sun Oct 30 08:29:51 2011 Tanaka Akira <akr@fsij.org> Sun Oct 30 08:29:51 2011 Tanaka Akira <akr@fsij.org>
* io.c (rb_cloexec_dup2): don't set CLOEXEC for standard file * io.c (rb_cloexec_dup2): don't set CLOEXEC for standard file

9
io.c
View File

@ -167,6 +167,7 @@ fd_set_cloexec(int fd)
if (flags == -1) { if (flags == -1) {
rb_bug("rb_fd_set_cloexec: fcntl(%d, F_GETFD) failed: %s", fd, strerror(errno)); rb_bug("rb_fd_set_cloexec: fcntl(%d, F_GETFD) failed: %s", fd, strerror(errno));
} }
/* Don't set CLOEXEC for standard file descriptors: 0, 1, 2. */
if (2 < fd) { if (2 < fd) {
if (!(flags & FD_CLOEXEC)) { if (!(flags & FD_CLOEXEC)) {
flags |= FD_CLOEXEC; flags |= FD_CLOEXEC;
@ -206,10 +207,11 @@ rb_cloexec_dup(int oldfd)
{ {
int ret; int ret;
#ifdef F_DUPFD_CLOEXEC #if defined(HAVE_FCNTL) && defined(F_DUPFD_CLOEXEC)
static int try_fcntl = 1; static int try_fcntl = 1;
if (try_fcntl) { if (try_fcntl) {
ret = fcntl(oldfd, F_DUPFD_CLOEXEC, 0); /* don't allocate standard file descriptors: 0, 1, 2 */
ret = fcntl(oldfd, F_DUPFD_CLOEXEC, 3);
/* 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 (ret == -1 && errno == EINVAL) { if (ret == -1 && errno == EINVAL) {
try_fcntl = 0; try_fcntl = 0;
@ -219,6 +221,9 @@ rb_cloexec_dup(int oldfd)
else { else {
ret = dup(oldfd); ret = dup(oldfd);
} }
#elif defined(HAVE_FCNTL) && defined(F_DUPFD)
/* don't allocate standard file descriptors: 0, 1, 2 */
ret = fcntl(oldfd, F_DUPFD, 3);
#else #else
ret = dup(oldfd); ret = dup(oldfd);
#endif #endif