summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-07 14:40:22 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-02-07 14:40:22 +0000
commite8d45cf99332b963ec67649896f72614d9ddb654 (patch)
tree3c5c76078df9494d4fd3a46bd2e42aacca273d7e
parent1aacb6d9d7372e8c7da78b775eb15c999f977e2d (diff)
downloadruby-e8d45cf99332b963ec67649896f72614d9ddb654.tar.gz
ruby-e8d45cf99332b963ec67649896f72614d9ddb654.tar.xz
ruby-e8d45cf99332b963ec67649896f72614d9ddb654.zip
fix previous commit to check stdout is a tty.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@7914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--io.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/io.c b/io.c
index 3331d7c6a..0f8da4775 100644
--- a/io.c
+++ b/io.c
@@ -801,8 +801,13 @@ static int
io_getc(OpenFile *fptr)
{
int r;
- if (fptr->fd == 0 && (fptr->mode & FMODE_TTY)) {
- rb_io_flush(rb_stdout);
+ if (fptr->fd == 0 && (fptr->mode & FMODE_TTY) &&
+ TYPE(rb_stdout) == T_FILE) {
+ OpenFile *ofp;
+ GetOpenFile(rb_stdout, ofp);
+ if (ofp->mode & FMODE_TTY) {
+ rb_io_flush(rb_stdout);
+ }
}
if (fptr->rbuf == NULL) {
fptr->rbuf_off = 0;