From af6b1f8edf07f194233f6ad378e6691fe60a1105 Mon Sep 17 00:00:00 2001 From: Tom Murphy Date: Tue, 13 Mar 2018 18:28:56 +0000 Subject: [PATCH] Remove CON_FlushIn function and where STDIN needs flushing, use tcflush POSIX function --- code/sys/con_tty.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/code/sys/con_tty.c b/code/sys/con_tty.c index 2c2b595c..58f178ad 100644 --- a/code/sys/con_tty.c +++ b/code/sys/con_tty.c @@ -73,20 +73,6 @@ static int hist_current = -1, hist_count = 0; #define TTY_CONSOLE_PROMPT "]" #endif -/* -================== -CON_FlushIn - -Flush stdin, I suspect some terminals are sending a LOT of shit -FIXME relevant? -================== -*/ -static void CON_FlushIn( void ) -{ - char key; - while (read(STDIN_FILENO, &key, 1)!=-1); -} - /* ================== CON_Back @@ -441,7 +427,7 @@ char *CON_Input( void ) TTY_con = *history; CON_Show(); } - CON_FlushIn(); + tcflush(STDIN_FILENO, TCIFLUSH); return NULL; break; case 'B': @@ -455,7 +441,7 @@ char *CON_Input( void ) Field_Clear(&TTY_con); } CON_Show(); - CON_FlushIn(); + tcflush(STDIN_FILENO, TCIFLUSH); return NULL; break; case 'C': @@ -467,7 +453,7 @@ char *CON_Input( void ) } } Com_DPrintf("droping ISCTL sequence: %d, TTY_erase: %d\n", key, TTY_erase); - CON_FlushIn(); + tcflush(STDIN_FILENO, TCIFLUSH); return NULL; } if (TTY_con.cursor >= sizeof(text) - 1)