[src/trunk]: src/lib/libcurses No, really, make sure ECHO is cleared in cbrea...

[mycroft <mycroft%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2b14b159ee58
branches:  trunk
changeset: 485427:2b14b159ee58
user:      mycroft <mycroft%NetBSD.org@localhost>
date:      Thu Apr 27 17:50:01 2000 +0000

description:
No, really, make sure ECHO is cleared in cbreak() mode too.

diffstat:

 lib/libcurses/getch.c |  7 +++----
 lib/libcurses/tty.c   |  8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r d10d85362df7 -r 2b14b159ee58 lib/libcurses/getch.c
--- a/lib/libcurses/getch.c     Thu Apr 27 17:49:15 2000 +0000
+++ b/lib/libcurses/getch.c     Thu Apr 27 17:50:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: getch.c,v 1.25 2000/04/27 00:23:26 jdc Exp $   */
+/*     $NetBSD: getch.c,v 1.26 2000/04/27 17:50:01 mycroft Exp $       */
 
 /*
  * Copyright (c) 1981, 1993, 1994
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)getch.c    8.2 (Berkeley) 5/4/94";
 #else
-__RCSID("$NetBSD: getch.c,v 1.25 2000/04/27 00:23:26 jdc Exp $");
+__RCSID("$NetBSD: getch.c,v 1.26 2000/04/27 17:50:01 mycroft Exp $");
 #endif
 #endif                                 /* not lint */
 
@@ -766,9 +766,8 @@
        }
 
        __restore_termios();
-       if (__echoit) {
+       if (__echoit)
                waddch(win, (chtype) inp);
-       }
        if (weset)
                nocbreak();
 
diff -r d10d85362df7 -r 2b14b159ee58 lib/libcurses/tty.c
--- a/lib/libcurses/tty.c       Thu Apr 27 17:49:15 2000 +0000
+++ b/lib/libcurses/tty.c       Thu Apr 27 17:50:01 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: tty.c,v 1.17 2000/04/27 17:38:30 mycroft Exp $ */
+/*     $NetBSD: tty.c,v 1.18 2000/04/27 17:50:01 mycroft Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)tty.c      8.6 (Berkeley) 1/10/95";
 #else
-__RCSID("$NetBSD: tty.c,v 1.17 2000/04/27 17:38:30 mycroft Exp $");
+__RCSID("$NetBSD: tty.c,v 1.18 2000/04/27 17:50:01 mycroft Exp $");
 #endif
 #endif                         /* not lint */
 
@@ -108,14 +108,14 @@
         * default VMIN is 4.  Majorly stupid.
         */
        cbreakt = __baset;
-       cbreakt.c_lflag &= ~ICANON;
+       cbreakt.c_lflag &= ~(ECHO | ECHONL | ICANON);
        cbreakt.c_cc[VMIN] = 1;
        cbreakt.c_cc[VTIME] = 0;
 
        rawt = cbreakt;
        rawt.c_iflag &= ~(IGNBRK | BRKINT | PARMRK | INLCR | IGNCR | ICRNL | IXON);
        rawt.c_oflag &= ~OPOST;
-       rawt.c_lflag &= ~(ECHO | ECHONL | ICANON | ISIG | IEXTEN);
+       rawt.c_lflag &= ~(ISIG | IEXTEN);
 
        /*
         * In general, curses should leave hardware-related settings alone.