ruby-changes:21526
From: akr <ko1@a...>
Date: Mon, 31 Oct 2011 00:17:41 +0900 (JST)
Subject: [ruby-changes:21526] akr:r33575 (trunk): * include/ruby/intern.h (rb_cloexec_fcntl_dupfd): declared.
akr 2011-10-31 00:17:27 +0900 (Mon, 31 Oct 2011) New Revision: 33575 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=33575 Log: * 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. Modified files: trunk/ChangeLog trunk/include/ruby/intern.h trunk/io.c trunk/process.c Index: include/ruby/intern.h =================================================================== --- include/ruby/intern.h (revision 33574) +++ include/ruby/intern.h (revision 33575) @@ -506,6 +506,7 @@ int rb_cloexec_dup(int oldfd); int rb_cloexec_dup2(int oldfd, int newfd); int rb_cloexec_pipe(int fildes[2]); +int rb_cloexec_fcntl_dupfd(int fd, int minfd); #define RB_RESERVED_FD_P(fd) rb_reserved_fd_p(fd) void rb_update_max_fd(int fd); void rb_fd_set_cloexec(int fd); Index: ChangeLog =================================================================== --- ChangeLog (revision 33574) +++ ChangeLog (revision 33575) @@ -1,3 +1,12 @@ +Mon Oct 31 00:16:11 2011 Tanaka Akira <akr@f...> + + * 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. + Sun Oct 30 22:46:46 2011 Tanaka Akira <akr@f...> * configure.in: check pipe2. Index: io.c =================================================================== --- io.c (revision 33574) +++ io.c (revision 33575) @@ -299,6 +299,16 @@ 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 @@ 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 @@ 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 Index: process.c =================================================================== --- process.c (revision 33574) +++ process.c (revision 33575) @@ -2508,10 +2508,10 @@ min = fdp[i]+1; while (RTEST(rb_hash_lookup(fds, INT2FIX(min)))) min++; - ret = fcntl(fdp[i], F_DUPFD, min); + ret = rb_cloexec_fcntl_dupfd(fdp[i], min); if (ret == -1) return -1; - rb_fd_set_cloexec(ret); + rb_update_max_fd(ret); close(fdp[i]); fdp[i] = ret; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/