From 552243aa152098835b82cddd5919585cd0b229d4 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 13 May 2010 08:56:11 +0000 Subject: * ext/io/console/console.c (console_set_echo, console_echo_p): use primary fd. [ruby-dev:41309] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27781 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ ext/io/console/console.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1623eb4b1e..1db25a78e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu May 13 17:56:07 2010 Nobuyoshi Nakada + + * ext/io/console/console.c (console_set_echo, console_echo_p): use + primary fd. [ruby-dev:41309] + Thu May 13 13:30:05 2010 Nobuyoshi Nakada * marshal.c (w_float): use minimal representation. diff --git a/ext/io/console/console.c b/ext/io/console/console.c index 7656c66c21..0b29c72c7a 100644 --- a/ext/io/console/console.c +++ b/ext/io/console/console.c @@ -315,7 +315,7 @@ console_set_echo(VALUE io, VALUE f) int fd; GetOpenFile(io, fptr); - fd = GetWriteFD(fptr); + fd = GetReadFD(fptr); if (!getattr(fd, &t)) rb_sys_fail(0); if (RTEST(f)) set_echo(&t); @@ -339,7 +339,7 @@ console_echo_p(VALUE io) int fd; GetOpenFile(io, fptr); - fd = GetWriteFD(fptr); + fd = GetReadFD(fptr); if (!getattr(fd, &t)) rb_sys_fail(0); return echo_p(&t) ? Qtrue : Qfalse; } -- cgit v1.2.3