summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-23 15:38:06 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-10-23 15:38:06 +0000
commit85db5402bb15a3e3f560e6bebd22653a661f3805 (patch)
tree4fc53ebfdd5bbab438c0cbdc88b53e716c19f82b
parent242b124e77414f9574a46583dd691be051ab26eb (diff)
downloadruby-85db5402bb15a3e3f560e6bebd22653a661f3805.tar.gz
ruby-85db5402bb15a3e3f560e6bebd22653a661f3805.tar.xz
ruby-85db5402bb15a3e3f560e6bebd22653a661f3805.zip
* io.c (io_cntl): update max file descriptor by the result of
fcntl(F_DUPFD). git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--io.c3
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 29e563bca..cdb8245c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Oct 24 00:36:47 2009 Tanaka Akira <akr@fsij.org>
+
+ * io.c (io_cntl): update max file descriptor by the result of
+ fcntl(F_DUPFD).
+
Fri Oct 23 14:25:54 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (target, target_alias): replace with real cpu.
diff --git a/io.c b/io.c
index 7ef11920e..426cba5a5 100644
--- a/io.c
+++ b/io.c
@@ -7237,6 +7237,9 @@ io_cntl(int fd, unsigned long cmd, long narg, int io_p)
# else
retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, (int)cmd, narg);
# endif
+ if (!io_p && retval != -1 && cmd == F_DUPFD) {
+ UPDATE_MAXFD(retval);
+ }
#else
if (!io_p) {
rb_notimplement();