Changeset 3435 for trunk/src/kash/jobs.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/jobs.c (modified) (10 diffs)

trunk/src/kash/jobs.c

@@ -86 +86 @@
 #ifdef KASH_USE_FORKSHELL2
 static int forkparent(shinstance *psh, struct job *jp, union node *n, int mode, pid_t pid);
-static void forkchild(shinstance *psh, struct job *jp, union node *n, int mode, int vforked);
+static void forkchild(shinstance *psh, struct job *jp, union node *n, int mode);
 #endif
 
@@ -149 +149 @@
                 } while (0);
 
-                setsignal(psh, SIGTSTP, 0);
-                setsignal(psh, SIGTTOU, 0);
-                setsignal(psh, SIGTTIN, 0);
+                setsignal(psh, SIGTSTP);
+                setsignal(psh, SIGTTOU);
+                setsignal(psh, SIGTTIN);
                 if (sh_getpgid(psh, 0) != psh->rootpid && sh_setpgid(psh, 0, psh->rootpid) == -1)
                         error(psh, "Cannot set process group (%s) at %d",
@@ -167 +167 @@
                 shfile_close(&psh->fdtab, psh->ttyfd);
                 psh->ttyfd = -1;
-                setsignal(psh, SIGTSTP, 0);
-                setsignal(psh, SIGTTOU, 0);
-                setsignal(psh, SIGTTIN, 0);
+                setsignal(psh, SIGTSTP);
+                setsignal(psh, SIGTTOU);
+                setsignal(psh, SIGTTIN);
         }
         psh->jobctl = on;
@@ -798 +798 @@
                 return -1; /* won't get here */
         case 0:
-                forkchild(psh, jp, n, mode, 0);
+                forkchild(psh, jp, n, mode);
                 return 0;
         default:
@@ -817 +817 @@
                 /* child */
                 (void)arglen;
-                forkchild(psh, jp, n, mode, 0);
+                forkchild(psh, jp, n, mode);
                 sh_exit(psh, child(psh, nchild, argp));
                 return 0;
@@ -866 +866 @@
 #endif
 void
-forkchild(shinstance *psh, struct job *jp, union node *n, int mode, int vforked)
+forkchild(shinstance *psh, struct job *jp, union node *n, int mode)
 {
         int wasroot;
@@ -875 +875 @@
         wasroot = psh->rootshell;
         TRACE((psh, "Child shell %d\n", sh_getpid(psh)));
-        if (!vforked)
-                psh->rootshell = 0;
-
-        closescript(psh, vforked);
-        clear_traps(psh, vforked);
-#if JOBS
-        if (!vforked)
-                psh->jobctl = 0;                /* do job control only in root shell */
+        psh->rootshell = 0;
+
+        closescript(psh);
+        clear_traps(psh);
+#if JOBS
+        psh->jobctl = 0;                /* do job control only in root shell */
         if (wasroot && mode != FORK_NOJOB && mflag(psh)) {
                 if (jp == NULL || jp->nprocs == 0)
@@ -896 +894 @@
                                     sh_strerror(psh, errno), __LINE__);
                 }
-                setsignal(psh, SIGTSTP, vforked);
-                setsignal(psh, SIGTTOU, vforked);
+                setsignal(psh, SIGTSTP);
+                setsignal(psh, SIGTTOU);
         } else if (mode == FORK_BG) {
-                ignoresig(psh, SIGINT, vforked);
-                ignoresig(psh, SIGQUIT, vforked);
+                ignoresig(psh, SIGINT);
+                ignoresig(psh, SIGQUIT);
                 if ((jp == NULL || jp->nprocs == 0) &&
                     ! fd0_redirected_p(psh)) {
@@ -910 +908 @@
 #else
         if (mode == FORK_BG) {
-                ignoresig(psh, SIGINT, vforked);
-                ignoresig(psh, SIGQUIT, vforked);
+                ignoresig(psh, SIGINT);
+                ignoresig(psh, SIGQUIT);
                 if ((jp == NULL || jp->nprocs == 0) &&
                     ! fd0_redirected_p(psh)) {
@@ -921 +919 @@
 #endif
         if (wasroot && iflag(psh)) {
-                setsignal(psh, SIGINT, vforked);
-                setsignal(psh, SIGQUIT, vforked);
-                setsignal(psh, SIGTERM, vforked);
-        }
-
-        if (!vforked)
-                psh->jobs_invalid = 1;
+                setsignal(psh, SIGINT);
+                setsignal(psh, SIGQUIT);
+                setsignal(psh, SIGTERM);
+        }
+
+        psh->jobs_invalid = 1;
 }