* io.c (rb_cloexec_dup2): check oldfd == newfd at first.

pointed by KOSAKI Motohiro.  [ruby-dev:44713]


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

ChangeLog

@@ -1,3 +1,8 @@
+Mon Oct 31 12:05:24 2011  Tanaka Akira  <akr@fsij.org>
+
+	* io.c (rb_cloexec_dup2): check oldfd == newfd at first.
+	  pointed by KOSAKI Motohiro.  [ruby-dev:44713]
+
 Mon Oct 31 10:50:26 2011  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* io.c (rb_cloexec_fcntl_dupfd): this function needs F_DUPFD.

io.c

@@ -239,6 +239,12 @@ rb_cloexec_dup2(int oldfd, int newfd)
 {
     int ret;
 
+    /* When oldfd == newfd, dup2 succeeds but dup3 fails with EINVAL.
+     * rb_cloexec_dup2 succeeds as dup2.  */
+    if (oldfd == newfd) {
+        ret = newfd;
+    }
+    else {
 #if defined(HAVE_DUP3) && defined(O_CLOEXEC)
         static int try_dup3 = 1;
         if (2 < newfd && try_dup3) {
@@ -258,6 +264,7 @@ rb_cloexec_dup2(int oldfd, int newfd)
         ret = dup2(oldfd, newfd);
 #endif
         if (ret == -1) return -1;
+    }
     fd_set_cloexec(ret);
     return ret;
 }