summaryrefslogtreecommitdiff
path: root/ext/io/console/console.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-06 01:11:47 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-03-06 01:11:47 +0000
commitdd9569ded88cf09e20a8ba9e341dc7236c12d73c (patch)
tree5aa8e3bea03f838ca90a09dc6d5f8a39127e107f /ext/io/console/console.c
parent2706b60ccbc5ebdf810bc496307815fa125647df (diff)
* ext/io/console/console.c (set_rawmode): clear ECHOE and ECHOK
bits too. * ext/io/console/console.c (echo_p): ignore ECHOE and ECHOK bits. [ruby-dev:45309] [Bug #6116] * ext/io/console/console.c (console_raw): fix rdoc. * ext/io/console/console.c (console_set_echo): mentioned about platform dependency. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34917 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/io/console/console.c')
-rw-r--r--ext/io/console/console.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/io/console/console.c b/ext/io/console/console.c
index 228ac80fef5..7880e7ae789 100644
--- a/ext/io/console/console.c
+++ b/ext/io/console/console.c
@@ -125,10 +125,11 @@ set_rawmode(conmode *t, void *arg)
{
#ifdef HAVE_CFMAKERAW
cfmakeraw(t);
+ t->c_lflag &= ~(ECHOE|ECHOK);
#elif defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
t->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
t->c_oflag &= ~OPOST;
- t->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
+ t->c_lflag &= ~(ECHO|ECHOE|ECHOK|ECHONL|ICANON|ISIG|IEXTEN);
t->c_cflag &= ~(CSIZE|PARENB);
t->c_cflag |= CS8;
#elif defined HAVE_SGTTY_H
@@ -189,7 +190,7 @@ static int
echo_p(conmode *t)
{
#if defined HAVE_TERMIOS_H || defined HAVE_TERMIO_H
- return (t->c_lflag & (ECHO | ECHOE | ECHOK | ECHONL)) != 0;
+ return (t->c_lflag & (ECHO | ECHONL)) != 0;
#elif defined HAVE_SGTTY_H
return (t->sg_flags & ECHO) != 0;
#elif defined _WIN32
@@ -295,7 +296,7 @@ ttymode(VALUE io, VALUE (*func)(VALUE), void (*setter)(conmode *, void *), void
*
* STDIN.raw(&:gets)
*
- * will read and return a line with echo back and line editing.
+ * will read and return a line without echo back and line editing.
*
* You must require 'io/console' to use this method.
*/
@@ -419,6 +420,8 @@ console_noecho(VALUE io)
* io.echo = flag
*
* Enables/disables echo back.
+ * On some platforms, all combinations of this flags and raw/cooked
+ * mode may not be valid.
*
* You must require 'io/console' to use this method.
*/