Changeset 3435 for trunk/src/kash/trap.c

Timestamp:

Sep 2, 2020, 10:30:54 PM (5 years ago)

Author:

bird

Message:

kash: Remove vfork code, we've never used it and we wont need it if we replace fork() with pthreads.

File:

• trunk/src/kash/trap.c (modified) (9 diffs)

trunk/src/kash/trap.c

@@ -187 +187 @@
 
                 if (signo != 0)
-                        setsignal(psh, signo, 0);
+                        setsignal(psh, signo);
                 INTON;
                 ap++;
@@ -203 +203 @@
 
 void
-clear_traps(shinstance *psh, int vforked)
+clear_traps(shinstance *psh)
 {
         char **tp;
@@ -210 +210 @@
                 if (*tp && **tp) {      /* trap not NULL or SIG_IGN */
                         INTOFF;
-                        if (!vforked) {
-                                ckfree(psh, *tp);
-                                *tp = NULL;
-                        }
+                        ckfree(psh, *tp);
+                        *tp = NULL;
                         if (tp != &psh->trap[0])
-                                setsignal(psh, (int)(tp - psh->trap), vforked);
+                                setsignal(psh, (int)(tp - psh->trap));
                         INTON;
                 }
@@ -229 +227 @@
 
 void
-setsignal(shinstance *psh, int signo, int vforked)
+setsignal(shinstance *psh, int signo)
 {
         int action;
@@ -241 +239 @@
         else
                 action = S_IGN;
-        if (psh->rootshell && !vforked && action == S_DFL) {
+        if (psh->rootshell && action == S_DFL) {
                 switch (signo) {
                 case SIGINT:
@@ -298 +296 @@
                 case S_IGN:     sigact = SH_SIG_IGN;    break;
         }
-        if (!vforked)
-                *t = action;
+        *t = action;
         sh_siginterrupt(psh, signo, 1);
         sh_signal(psh, signo, sigact);
@@ -323 +320 @@
 
 void
-ignoresig(shinstance *psh, int signo, int vforked)
+ignoresig(shinstance *psh, int signo)
 {
         if (psh->sigmode[signo - 1] != S_IGN && psh->sigmode[signo - 1] != S_HARD_IGN) {
                 sh_signal(psh, signo, SH_SIG_IGN);
         }
-        if (!vforked)
-                psh->sigmode[signo - 1] = S_HARD_IGN;
+        psh->sigmode[signo - 1] = S_HARD_IGN;
 }
 
@@ -340 +336 @@
         char *sm;
 
-        clear_traps(psh, 0);
+        clear_traps(psh);
         for (sm = psh->sigmode ; sm < psh->sigmode + NSIG ; sm++) {
                 if (*sm == S_IGN)
@@ -409 +405 @@
         if (on == is_interactive)
                 return;
-        setsignal(psh, SIGINT, 0);
-        setsignal(psh, SIGQUIT, 0);
-        setsignal(psh, SIGTERM, 0);
+        setsignal(psh, SIGINT);
+        setsignal(psh, SIGQUIT);
+        setsignal(psh, SIGTERM);
         is_interactive = on;
 }