* ext/io/console/console.c (ttymode): reverted previous commit.

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

3 files changed, 9 insertions, 32 deletions

diff --git a/ChangeLog b/ChangeLog
index 89e408a97f..398b2b8391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Mon May 10 00:35:41 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/io/console/console.c (ttymode): reverted previous commit.
+
 Sun May  9 23:53:14 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* include/ruby/ruby.h (RB_GC_GUARD_PTR): get rid of removal by
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index 764f632027..a521312e47 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -173,23 +173,6 @@ get_write_fd(const rb_io_t *fptr)
 
 #define FD_PER_IO 2
 
-#if defined HAVE_DUP3
-#define dup_private(fd) dup3((fd), -1, O_CLOEXEC)
-#elif defined F_DUPFD_CLOEXEC
-#define dup_private(fd) fcntl((fd), F_DUPFD_CLOEXEC)
-#elif defined O_CLOEXEC
-static inline int
-dup_private(int fd)
-{
-    fd = dup(fd);
-    if (fd != -1) fcntl(fd, F_SETFD, O_CLOEXEC);
-    return fd;
-}
-#define dup_private(fd) dup_private(fd)
-#else
-#define dup_private(fd) dup(fd)
-#endif
-
 static VALUE
 ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
 {
@@ -197,7 +180,6 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
     int status = -1;
     int error = 0;
     int fd[FD_PER_IO];
-    int tmpfd, dupped = 0;
     conmode t[FD_PER_IO];
     VALUE result = Qnil;
 
@@ -205,10 +187,6 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
     fd[0] = GetReadFD(fptr);
     if (fd[0] != -1) {
 	if (set_ttymode(fd[0], t+0, setter)) {
-	    if ((tmpfd = dup_private(fd[0])) != -1) {
-		fd[0] = tmpfd;
-		dupped |= 1 << 0;
-	    }
 	    status = 0;
 	}
 	else {
@@ -219,10 +197,6 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
     fd[1] = GetWriteFD(fptr);
     if (fd[1] != -1 && fd[1] != fd[0]) {
 	if (set_ttymode(fd[1], t+1, setter)) {
-	    if ((tmpfd = dup_private(fd[1])) != -1) {
-		fd[1] = tmpfd;
-		dupped |= 1 << 1;
-	    }
 	    status = 0;
 	}
 	else {
@@ -233,19 +207,18 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *))
     if (status == 0) {
 	result = rb_protect(func, io, &status);
     }
-    if (fd[0] != -1) {
+    GetOpenFile(io, fptr);
+    if (fd[0] != -1 && fd[0] == GetReadFD(fptr)) {
 	if (!setattr(fd[0], t+0)) {
 	    error = errno;
 	    status = -1;
 	}
-	if (dupped & (1 << 0)) close(fd[0]);
     }
-    if (fd[1] != -1 && fd[1] != fd[0]) {
+    if (fd[1] != -1 && fd[1] != fd[0] && fd[1] == GetWriteFD(fptr)) {
 	if (!setattr(fd[1], t+1)) {
 	    error = errno;
 	    status = -1;
 	}
-	if (dupped & (1 << 1)) close(fd[1]);
     }
     if (status) {
 	if (status == -1) {
diff --git a/version.h b/version.h
index 0aa57afb1e..8d36464a30 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_RELEASE_DATE "2010-05-09"
+#define RUBY_RELEASE_DATE "2010-05-10"
 #define RUBY_PATCHLEVEL -1
 #define RUBY_BRANCH_NAME "trunk"
 
@@ -8,7 +8,7 @@
 #define RUBY_VERSION_TEENY 1
 #define RUBY_RELEASE_YEAR 2010
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
 
 #include "ruby/version.h"