* include/ruby/intern.h (rb_cloexec_fcntl_dupfd): declared.

* io.c (rb_cloexec_fcntl_dupfd): new function.
  (nogvl_io_cntl): use rb_cloexec_fcntl_dupfd.

* process.c (move_fds_to_avoid_crash): use rb_cloexec_fcntl_dupfd.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33575 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 15 insertions, 2 deletions

diff --git a/io.c b/io.c
index 2fb9ee5b63..7d31dce478 100644
--- a/io.c
+++ b/io.c
@@ -299,6 +299,16 @@ rb_cloexec_pipe(int fildes[2])
     return ret;
 }
 
+int
+rb_cloexec_fcntl_dupfd(int fd, int minfd)
+{
+    int ret;
+    ret = fcntl(fd, F_DUPFD, minfd);
+    if (ret == -1) return -1;
+    fd_set_cloexec(ret);
+    return ret;
+}
+
 #define argf_of(obj) (*(struct argf *)DATA_PTR(obj))
 #define ARGF argf_of(argf)
 
@@ -7821,7 +7831,10 @@ static VALUE nogvl_io_cntl(void *ptr)
     if (arg->io_p)
 	return (VALUE)ioctl(arg->fd, arg->cmd, arg->narg);
     else
-	return (VALUE)fcntl(arg->fd, arg->cmd, arg->narg);
+        if (arg->cmd == F_DUPFD)
+            return (VALUE)rb_cloexec_fcntl_dupfd(arg->fd, arg->narg);
+        else
+            return (VALUE)fcntl(arg->fd, arg->cmd, arg->narg);
 }
 
 static int
@@ -7844,7 +7857,7 @@ io_cntl(int fd, int cmd, long narg, int io_p)
     retval = (int)rb_thread_io_blocking_region(nogvl_io_cntl, &arg, fd);
 #if defined(F_DUPFD)
     if (!io_p && retval != -1 && cmd == F_DUPFD) {
-	rb_fd_set_cloexec(retval);
+	rb_update_max_fd(retval);
     }
 #endif