summaryrefslogtreecommitdiff
path: root/io.c
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
commitb8f04a8bcba7a059d1ccd95f4ba5dfb01e8e2c67 (patch)
tree3c5c76078df9494d4fd3a46bd2e42aacca273d7e /io.c
parentd486686eb768619714328bff86be8e7711c2e967 (diff)
downloadruby-b8f04a8bcba7a059d1ccd95f4ba5dfb01e8e2c67.tar.gz
fix previous commit to check stdout is a tty.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7914 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'io.c')
-rw-r--r--io.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/io.c b/io.c
index 3331d7c6a9..0f8da47751 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;