yugui	2010-01-30 21:52:27 +0900 (Sat, 30 Jan 2010)

  New Revision: 26502

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=26502

  Log:
    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.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/io.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 26501)
+++ ruby_1_9_1/ChangeLog	(revision 26502)
@@ -1,3 +1,12 @@
+Sun Oct 25 13:33:58 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* io.c (io_cntl): F_DUPFD is platform dependent.
+
+Sat Oct 24 00:36:47 2009  Tanaka Akira  <akr@f...>
+
+	* 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@r...>
 
 	* lib/pathname.rb (Pathname::SAME_PATHS): FNM_SYSCASE is always
Index: ruby_1_9_1/io.c
===================================================================
--- ruby_1_9_1/io.c	(revision 26501)
+++ ruby_1_9_1/io.c	(revision 26502)
@@ -6708,6 +6708,11 @@
 # 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();
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 26501)
+++ ruby_1_9_1/version.h	(revision 26502)
@@ -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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/