Changeset 3506 in kBuild

Timestamp:

Dec 15, 2021 10:54:57 PM (3 years ago)

Author:

bird

Message:

kash: Threat SIGBREAK as SIGINT.

File:

• trunk/src/kash/shinstance.c (modified) (3 diffs)

trunk/src/kash/shinstance.c

@@ -399 +399 @@
 
     /* input.h/c */
-    popallfiles(psh);
-    while (psh->basepf.strpush)
-        popstring(psh);
+    if (psh->parsefile != NULL)
+    {
+        popallfiles(psh);
+        while (psh->basepf.strpush)
+            popstring(psh);
+    }
 
     /* jobs.h/c */
@@ -1004 +1007 @@
 /*    fprintf(stderr, "sh_sig_common_handler: signo=%d:%s\n", signo, sys_signame[signo]); */
 
+#ifdef _MSC_VER
+    /* We're treating SIGBREAK as if it was SIGINT for now: */
+    if (signo == SIGBREAK)
+        signo = SIGINT;
+#endif
+
     /*
      * No need to take locks if there is only one shell.
@@ -1114 +1123 @@
                 signo, sys_signame[signo], g_sig_state[signo].sa.sa_handler, g_sig_state[signo].sa.sa_flags));
 #ifdef _MSC_VER
+        /* Throw SIGBREAK in with SIGINT for now. */
+        if (signo == SIGINT)
+            signal(SIGBREAK, g_sig_state[signo].sa.sa_handler);
+
         if (signal(signo, g_sig_state[signo].sa.sa_handler) == SIG_ERR)
         {