summaryrefslogtreecommitdiff
path: root/ext/io/console/console.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-09 15:35:43 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-09 15:35:43 +0000
commit08bf7189f873e74e973eff7cee6540b974720a31 (patch)
treeb14a0a1afead7afadfb8b6e904b40ef4e4679417 /ext/io/console/console.c
parent24e1be741198228456276eba08d65abb3fb6bdb3 (diff)
* 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
Diffstat (limited to 'ext/io/console/console.c')
-rw-r--r--ext/io/console/console.c33
1 files changed, 3 insertions, 30 deletions
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index 764f632027b..a521312e477 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) {