win32: virtual terminal input fixes

- Disable ENABLE_PROCESSED_INPUT in raw mode.  Otherwise ^C isn't
  immediately detected during shell command line editing with
  virtual terminal input enabled.

- Switch read_key()/unix_readkey() to windows_read_key()/read_key().
  This allows the shell `read` builtin to use windows_read_key().
  Without this change `read` fails when virtual terminal input is
  enabled.

2 files changed, 7 insertions, 5 deletions

diff --git a/libbb/read_key.c b/libbb/read_key.c
index c34770028..54886cc9c 100644
--- a/libbb/read_key.c
+++ b/libbb/read_key.c
@@ -9,11 +9,7 @@
  */
 #include "libbb.h"
 
-#if ENABLE_PLATFORM_MINGW32
-int64_t FAST_FUNC unix_read_key(int fd, char *buffer, int timeout)
-#else
 int64_t FAST_FUNC read_key(int fd, char *buffer, int timeout)
-#endif
 {
         struct pollfd pfd;
         const char *seq;
@@ -116,6 +112,11 @@ int64_t FAST_FUNC read_key(int fd, char *buffer, int timeout)
                 0
         };
 
+#if ENABLE_PLATFORM_MINGW32
+        if (!(terminal_mode(FALSE) & VT_INPUT))
+                return windows_read_key(fd, buffer, timeout);
+#endif
+
         pfd.fd = fd;
         pfd.events = POLLIN;
 
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index bf15f4c75..cbeb24701 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -326,7 +326,8 @@ int FAST_FUNC get_termios_and_make_raw(int fd, struct termios *newterm, struct t
         *newterm = *oldterm;
 
 #if ENABLE_PLATFORM_MINGW32
-        newterm->imode &= ~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT);
+        newterm->imode &=
+                ~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
 #else
         /* Turn off buffered input (ICANON)
          * Turn off echoing (ECHO)