Changeset 3435 in kBuild for trunk/src/kash/exec.c

Timestamp:

Sep 2, 2020 8:30:54 PM (4 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/exec.c (modified) (8 diffs)

trunk/src/kash/exec.c

@@ -99 +99 @@
 
 
-STATIC void tryexec(shinstance *, char *, char **, char **, int, int);
+STATIC void tryexec(shinstance *, char *, char **, char **, int);
 STATIC void execinterp(shinstance *, char **, char **);
 STATIC void printentry(shinstance *, struct tblentry *, int);
@@ -118 +118 @@
 
 SH_NORETURN_1 void
-shellexec(shinstance *psh, char **argv, char **envp, const char *path, int idx, int vforked)
+shellexec(shinstance *psh, char **argv, char **envp, const char *path, int idx)
 {
         char *cmdname;
@@ -144 +144 @@
                 cmdname = stalloc(psh, argv0len + 5);
                 strcpy(cmdname, argv0);
-                tryexec(psh, cmdname, argv, envp, vforked, has_ext);
+                tryexec(psh, cmdname, argv, envp, has_ext);
                 TRACE((psh, "shellexec: cmdname=%s\n", cmdname));
                 stunalloc(psh, cmdname);
@@ -165 +165 @@
                 while ((cmdname = padvance(psh, &path, argv0)) != NULL) {
                         if (--idx < 0 && psh->pathopt == NULL) {
-                                tryexec(psh, cmdname, argv, envp, vforked, has_ext);
+                                tryexec(psh, cmdname, argv, envp, has_ext);
                                 if (errno != ENOENT && errno != ENOTDIR)
                                         e = errno;
@@ -185 +185 @@
                 break;
         }
-        TRACE((psh, "shellexec failed for '%s', errno %d, vforked %d, suppressint %d\n",
-                argv[0], e, vforked, psh->suppressint ));
+        TRACE((psh, "shellexec failed for '%s', errno %d, suppressint %d\n",
+                argv[0], e, psh->suppressint ));
         exerror(psh, EXEXEC, "%s: %s", argv[0], errmsg(psh, e, E_EXEC));
         /* NOTREACHED */
@@ -193 +193 @@
 
 STATIC void
-tryexec(shinstance *psh, char *cmd, char **argv, char **envp, int vforked, int has_ext)
+tryexec(shinstance *psh, char *cmd, char **argv, char **envp, int has_ext)
 {
         int e;
@@ -220 +220 @@
         e = errno;
         if (e == ENOEXEC) {
-                if (vforked) {
-                        /* We are currently vfork(2)ed, so raise an
-                         * exception, and evalcommand will try again
-                         * with a normal fork(2).
-                         */
-                        exraise(psh, EXSHELLPROC);
-                }
                 initshellproc(psh);
                 setinputfile(psh, cmd, 0);
@@ -347 +340 @@
             /* nothing*/;
         TRACE((psh, "hash bang '%s'\n", new[0]));
-        shellexec(psh, new, envp, pathval(psh), 0, 0);
+        shellexec(psh, new, envp, pathval(psh), 0);
         /* NOTREACHED */
 }