Merge branch 'ash'

3 files changed, 15 insertions, 2 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 3af9f4e64..182dfac13 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -1914,10 +1914,16 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
 
         INIT_S();
 
-#if !ENABLE_PLATFORM_MINGW32
+#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
          || !(initial_settings.c_lflag & ECHO)
         ) {
+#endif
                 /* Happens when e.g. stty -echo was run before */
                 parse_and_put_prompt(prompt);
                 /* fflush_all(); - done by parse_and_put_prompt */
@@ -1928,7 +1934,6 @@ int FAST_FUNC read_line_input(const char *prompt, char *command, int maxsize, li
                 DEINIT_S();
                 return len;
         }
-#endif
 
         init_unicode();
 
diff --git a/shell/ash.c b/shell/ash.c
index 0ff5adb04..c3b497938 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -4079,6 +4079,8 @@ waitpid_child(int *status)
         }
 
         LOOP(pid_nr++);
+        if (!pid_nr)
+                return -1;
         pidp = pidlist = ckmalloc(sizeof(*pidlist)*pid_nr);
         LOOP(*pidp++ = (HANDLE)ps->ps_pid);
         #undef LOOP
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;