From 9de9190d9bad8a695a5ea35e2e27a39f81644fea Mon Sep 17 00:00:00 2001
From: Greg Haerr <greg@censoft.com>
Date: Sun, 5 Apr 2020 14:38:32 -0600
Subject: [PATCH] [kernel][stty] Fix stty erase and sane

---
 elks/arch/i86/drivers/char/ntty.c | 7 ++++---
 elkscmd/sh_utils/stty.c           | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/elks/arch/i86/drivers/char/ntty.c b/elks/arch/i86/drivers/char/ntty.c
index f649625df..161593a77 100644
--- a/elks/arch/i86/drivers/char/ntty.c
+++ b/elks/arch/i86/drivers/char/ntty.c
@@ -203,11 +203,12 @@ void tty_echo(register struct tty *tty, unsigned char ch)
 {
     if ((tty->termios.c_lflag & ECHO)
 		|| ((tty->termios.c_lflag & ECHONL) && (ch == '\n'))) {
-	chq_addch(&tty->outq, ch);
-	if ((ch == '\b') && (tty->termios.c_lflag & ECHOE)) {
+	if ((ch == tty->termios.c_cc[VERASE]) && (tty->termios.c_lflag & ECHOE)) {
+	    chq_addch(&tty->outq, '\b');
 	    chq_addch(&tty->outq, ' ');
 	    chq_addch(&tty->outq, '\b');
-	}
+	} else
+	    chq_addch(&tty->outq, ch);
 	tty->ops->write(tty);
     }
 }
diff --git a/elkscmd/sh_utils/stty.c b/elkscmd/sh_utils/stty.c
index ac272ab12..ae6af05a1 100644
--- a/elkscmd/sh_utils/stty.c
+++ b/elkscmd/sh_utils/stty.c
@@ -95,7 +95,7 @@ struct winsize winsize;
 #define PROTO(a) ()
 #endif
 
-void main PROTO(( int argc, char **argv ));
+int main PROTO(( int argc, char **argv ));
 void report PROTO(( int flags ));
 int option PROTO(( char *opt, char *next ));
 int match PROTO(( char *s1, char *s2 ));
@@ -114,7 +114,7 @@ void set_min_tim PROTO(( int option, char *value ));
 #define print_char(c,d,n,a) (do_print_char((unsigned)(c),(unsigned)(d),(n),(a)))
 #define print_num(m,d,n,a) (do_print_num((unsigned)(m),(unsigned)(d),(n),(a)))
 
-void main(argc, argv)
+int main(argc, argv)
 int argc;
 char *argv[];
 {
@@ -886,7 +886,7 @@ char *opt, *next;
 	 */
 	termios.c_iflag= (TINPUT_DEF & ~(IGNPAR|ISTRIP|INPCK))
 		| (termios.c_iflag & (IGNPAR|ISTRIP|INPCK));
-	termios.c_oflag= (TOUTPUT_DEF & ~(XTABS))
+	termios.c_oflag= (TOUTPUT_DEF & ~(XTABS)) | ONLCR
 		| (termios.c_oflag & (XTABS));
 	termios.c_cflag= (TCTRL_DEF & ~(CLOCAL|CSIZE|CSTOPB|PARENB|PARODD))
 		| (termios.c_cflag & (CLOCAL|CSIZE|CSTOPB|PARENB|PARODD));