1 files changed, 18 insertions, 0 deletions

diff --git a/miscutils/bc.c b/miscutils/bc.c
index 28bc40c8b..31485ae9c 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -203,6 +203,9 @@
 
 #include "libbb.h"
 #include "common_bufsiz.h"
+#if ENABLE_PLATFORM_MINGW32
+# include "BB_VER.h"
+#endif
 
 #if !ENABLE_BC && !ENABLE_FEATURE_DC_BIG
 # include "dc.c"
@@ -7466,6 +7469,17 @@ static unsigned xc_vm_envLen(const char *var)
         return len;
 }
 
+#if ENABLE_PLATFORM_MINGW32 && ENABLE_FEATURE_BC_INTERACTIVE
+static BOOL WINAPI ctrl_handler(DWORD dwCtrlType)
+{
+        if (dwCtrlType == CTRL_C_EVENT || dwCtrlType == CTRL_BREAK_EVENT) {
+                bb_got_signal = SIGINT;
+                return TRUE;
+        }
+        return FALSE;
+}
+#endif
+
 static int xc_vm_init(const char *env_len)
 {
         G.prog.len = xc_vm_envLen(env_len);
@@ -7491,7 +7505,11 @@ static int xc_vm_init(const char *env_len)
                 // from stdin is not interrupted by ^C either,
                 // it restarts, thus fgetc() does not return on ^C.
                 // (This problem manifests only if line editing is disabled)
+# if !ENABLE_PLATFORM_MINGW32
                 signal_SA_RESTART_empty_mask(SIGINT, record_signo);
+# else
+                SetConsoleCtrlHandler(ctrl_handler, TRUE);
+# endif
 
                 // Without SA_RESTART, this exhibits a bug:
                 // "while (1) print 1" and try ^C-ing it.