diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-06 03:48:34 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-03-06 03:48:34 +0000 |
| commit | 4257124d00cc31d4b546f166278090df8e119beb (patch) | |
| tree | c09fac6c013cec9017cfd64adf7a04db0dd75555 /ext | |
| parent | 9f8a7d00b5e5f06fa9be4f865604b35ccee73ec3 (diff) | |
merge revision(s) 34917:
* 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/branches/ruby_1_9_3@34926 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/io/console/console.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/ext/io/console/console.c b/ext/io/console/console.c index d4161fd252..efad30c1ca 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. */ @@ -341,6 +342,8 @@ console_set_raw(int argc, VALUE *argv, VALUE io) * STDIN.cooked(&:gets) * * will read and return a line with echo back and line editing. + * + * You must require 'io/console' to use this method. */ static VALUE console_cooked(VALUE io) @@ -355,6 +358,8 @@ console_cooked(VALUE io) * Enables cooked mode. * * If the terminal mode needs to be back, use io.cooked { ... }. + * + * You must require 'io/console' to use this method. */ static VALUE console_set_cooked(VALUE io) @@ -415,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. */ |