2 files changed, 8 insertions, 0 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 413782d06..182dfac13 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1916,6 +1916,8 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
 
 #if ENABLE_PLATFORM_MINGW32
         memset(initial_settings.c_cc, sizeof(initial_settings.c_cc), 0);
+        initial_settings.c_cc[VINTR] = CTRL('C');
+        initial_settings.c_cc[VEOF] = CTRL('D');
         if (!isatty(0) || !isatty(1)) {
 #else
         if (tcgetattr(STDIN_FILENO, &initial_settings) < 0
diff --git a/win32/termios.c b/win32/termios.c
index e2dc96361..34a17bbfd 100644
--- a/win32/termios.c
+++ b/win32/termios.c
@@ -31,6 +31,12 @@ int64_t FAST_FUNC read_key(int fd, char *buf, int timeout UNUSED_PARAM)
                         continue;
                 if (!record.Event.KeyEvent.uChar.AsciiChar) {
                         DWORD state = record.Event.KeyEvent.dwControlKeyState;
+
+                        if (state & (RIGHT_CTRL_PRESSED|LEFT_CTRL_PRESSED) &&
+                            (record.Event.KeyEvent.wVirtualKeyCode >= 'A' &&
+                             record.Event.KeyEvent.wVirtualKeyCode <= 'Z'))
+                                return record.Event.KeyEvent.wVirtualKeyCode & ~0x40;
+
                         switch (record.Event.KeyEvent.wVirtualKeyCode) {
                         case VK_DELETE: return KEYCODE_DELETE;
                         case VK_INSERT: return KEYCODE_INSERT;