archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

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

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27705 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2010-05-09 15:35:43 +00:00
parent 24e1be7411
commit 08bf7189f8
3 changed files with 9 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ext/io/console/console.c
View file

@ -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) {