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

trunk/src/kash/eval.c

@@ -773 +773 @@
  *      evalcommand_out, evalcommand_parent, evalcommand_doit, evalcommand_child
  */
-/*int vforked = 0;*/
+/*int vforked = 0; - obsolete */
 
 /* Both child and parent exits thru here. */
@@ -983 +983 @@
                         trputs(psh, "normal command:  ");  trargs(psh, args->argv);
 #endif
-                        clearredir(psh, psh->vforked);
-                        redirect(psh, cmd->ncmd.redirect, psh->vforked ? REDIR_VFORK : 0);
-                        if (!psh->vforked)
-                                for (sp = args->varlist.list ; sp ; sp = sp->next)
-                                        setvareq(psh, sp->text, VEXPORT|VSTACK);
+                        clearredir(psh);
+                        redirect(psh, cmd->ncmd.redirect, 0);
+                        for (sp = args->varlist.list ; sp ; sp = sp->next)
+                                setvareq(psh, sp->text, VEXPORT|VSTACK);
                         envp = environment(psh);
-                        shellexec(psh, args->argv, envp, args->path, args->cmdentry.u.index, psh->vforked);
+                        shellexec(psh, args->argv, envp, args->path, args->cmdentry.u.index);
                         break;
                 }
@@ -1014 +1013 @@
         const char *path = pathval(psh);
 
-        psh->vforked = 0;
         /* First expand the arguments. */
         TRACE((psh, "evalcommand(0x%lx, %d) called\n", (long)cmd, flags));
@@ -1153 +1151 @@
 
                 if (flags & EV_BACKCMD) {
-                        if (!psh->vforked) {
-                                FORCEINTON;
-                        }
+                        FORCEINTON;
                         shfile_close(&psh->fdtab, pip[0]);
                         if (pip[1] != 1) {
@@ -1304 +1300 @@
                 for (sp = psh->cmdenviron; sp; sp = sp->next)
                         setvareq(psh, sp->text, VEXPORT|VSTACK);
-                shellexec(psh, argv + 1, environment(psh), pathval(psh), 0, 0);
+                shellexec(psh, argv + 1, environment(psh), pathval(psh), 0);
         }
         return 0;