merges r25446 and r25466 from trunk into ruby_1_9_1.

--
* io.c (io_cntl): update max file descriptor by the result of
  fcntl(F_DUPFD).
--
* io.c (io_cntl): F_DUPFD is platform dependent.

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

3 files changed, 15 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 9c93b17910..0c35e277d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Sun Oct 25 13:33:58 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* io.c (io_cntl): F_DUPFD is platform dependent.
+
+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 09:12:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/pathname.rb (Pathname::SAME_PATHS): FNM_SYSCASE is always
diff --git a/io.c b/io.c
index 7f6ed3c705..3f188ad531 100644
--- a/io.c
+++ b/io.c
@@ -6708,6 +6708,11 @@ io_cntl(int fd, int cmd, long narg, int io_p)
 # else
     retval = io_p?ioctl(fd, cmd, narg):fcntl(fd, cmd, narg);
 # endif
+# if defined(F_DUPFD)
+    if (!io_p && retval != -1 && cmd == F_DUPFD) {
+        UPDATE_MAXFD(retval);
+    }
+# endif
 #else
     if (!io_p) {
 	rb_notimplement();
diff --git a/version.h b/version.h
index 123dd64dc5..f97eedee15 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 407
+#define RUBY_PATCHLEVEL 408
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1