Changeset 3437 for trunk/src/kash/eval.c

Timestamp:

Sep 3, 2020, 3:52:14 PM (5 years ago)

Author:

bird

Message:

kash: refactoring evalcommand - complicated, part II.

File:

• trunk/src/kash/eval.c (modified) (8 diffs)

trunk/src/kash/eval.c

@@ -458 +458 @@
                 args.backgnd = backgnd;
                 forkshell2(psh, jp, n, backgnd ? FORK_BG : FORK_FG,
-                           evalsubshell_child, n, &args, sizeof(args));
+                           evalsubshell_child, n, &args, sizeof(args), NULL);
         }
 #else
@@ -578 +578 @@
                         args.pip[1] = pip[1];
                         forkshell2(psh, jp, lp->n, n->npipe.backgnd ? FORK_BG : FORK_FG,
-                                   evalpipe_child, lp->n, &args, sizeof(args));
+                                   evalpipe_child, lp->n, &args, sizeof(args), NULL);
                 }
 #else
@@ -677 +677 @@
                         args.pip[1] = pip[1];
                         forkshell2(psh, jp, n, FORK_NOJOB,
-                                   evalbackcmd_child, n, &args, sizeof(args));
+                                   evalbackcmd_child, n, &args, sizeof(args), NULL);
                 }
 #else
@@ -811 +811 @@
 struct evalcommanddoit
 {
-        struct cmdentry cmdentry;
-        char *lastarg;
-        const char *path;
+        struct stackmark smark;
+
         struct backcmd *backcmd;
         int flags;
         int argc;
         char **argv;
+        char *lastarg;
         struct arglist varlist;
-        struct stackmark smark;
+        const char *path;
+        struct cmdentry cmdentry;
+
+        /* for child stuff only: */
+        int pip[2];
 };
 
@@ -996 +1000 @@
 }
 
+/* child callback. */
+static int evalcommand_child(shinstance *psh, union node *cmd, void *argp)
+{
+        struct evalcommanddoit *args = (struct evalcommanddoit *)argp;
+
+        if (args->flags & EV_BACKCMD) {
+                FORCEINTON;
+                shfile_close(&psh->fdtab, args->pip[0]);
+                if (args->pip[1] != 1) {
+                        movefd(psh, args->pip[1], 1);
+                }
+        }
+        args->flags |= EV_EXIT;
+
+        evalcommand_doit(psh, cmd, args);
+        /* not reached */  /** @todo make it return here */
+        return 0;
+}
+
+/* Copies data in the argument structure from parent to child. */
+static void evalcommand_setup_child(shinstance *pshchild, shinstance *pshparent, void *argp)
+{
+        struct evalcommanddoit *args = (struct evalcommanddoit *)argp;
+        char **argv;
+        char **srcargv;
+        struct strlist *sp;
+        int argc, i;
+
+        setstackmark(pshchild, &args->smark);
+
+        /* copy arguments. */
+        srcargv = args->argv;
+        argc = args->argc;
+        args->argv = argv = stalloc(pshchild, sizeof(char *) * (argc + 1));
+        for (i = 0; i < argc; i++)
+                argv[i] = stsavestr(pshchild, srcargv[i]);
+        argv[argc] = NULL;
+        if (args->lastarg)
+                args->lastarg = argv[argc - 1];
+
+        /* copy variable list, checking for the 'path'. */
+        sp = args->varlist.list;
+        args->varlist.list = NULL;
+        args->varlist.lastp = &args->varlist.list;
+        for (; sp; sp = sp->next) {
+                struct strlist *snew = (struct strlist *)stalloc(pshchild, sizeof(*snew));
+                char *text;
+                snew->next = NULL;
+                snew->text = text = stsavestr(pshchild, sp->text);
+
+                if (&text[5] == args->path)
+                        args->path = &text[sizeof("PATH=") - 1];
+
+                *args->varlist.lastp = snew;
+                args->varlist.lastp = &snew->next;
+        }
+
+        if (args->path == pathval(pshparent))
+                args->path = pathval(pshchild);
+
+        /* back tick command should be ignored in this codepath
+           (flags != EV_BACKCMD as EV_EXIT is ORed in). */
+
+        /* If cmdentry references an internal function, we must duplicates it's nodes. */
+        if (args->cmdentry.cmdtype == CMDFUNCTION)
+                args->cmdentry.u.func = copyparsetree(pshchild, args->cmdentry.u.func); /** @todo isn't this duplicated already? */
+}
+
 /*
  * Execute a simple command.
@@ -1135 +1207 @@
                    || args.cmdentry.u.bltin == evalcmd))) {
                 struct job *jp;
-                int pip[2];
                 int mode;
+
                 INTOFF;
                 jp = makejob(psh, cmd, 1);
                 mode = cmd->ncmd.backgnd;
+                args.pip[0] = -1;
+                args.pip[1] = -1;
                 if (flags & EV_BACKCMD) {
                         mode = FORK_NOJOB;
-                        if (sh_pipe(psh, pip) < 0)
+                        if (sh_pipe(psh, args.pip) < 0)
                                 error(psh, "Pipe call failed");
                 }
+
+                args.backcmd = backcmd;
+                args.flags = flags;
+                args.path = path;
+#ifdef KASH_USE_FORKSHELL2
+                forkshell2(psh, jp, cmd, mode, evalcommand_child, cmd,
+                           &args, sizeof(args), evalcommand_setup_child);
+                evalcommand_parent(psh, flags, args.lastarg, &args.smark, mode, jp,
+                                                   args.pip, backcmd);
+#else
                 if (forkshell(psh, jp, cmd, mode) != 0) {
-                        evalcommand_parent(psh, flags, args.lastarg, &args.smark, mode, jp, pip, backcmd);
+                        evalcommand_parent(psh, flags, args.lastarg, &args.smark, mode, jp,
+                                                           args.pip, backcmd);
                         return; /* at end of routine */
                 }
-
-                if (flags & EV_BACKCMD) {
-                        FORCEINTON;
-                        shfile_close(&psh->fdtab, pip[0]);
-                        if (pip[1] != 1) {
-                                movefd(psh, pip[1], 1);
-                        }
-                }
-                flags |= EV_EXIT;
-
+                evalcommand_child(psh, cmd, &args);
+#endif
+        } else {
                 args.backcmd = backcmd;
                 args.flags = flags;
@@ -1164 +1242 @@
                 evalcommand_doit(psh, cmd, &args);
         }
-        else {
-                args.backcmd = backcmd;
-                args.flags = flags;
-                args.path = path;
-                evalcommand_doit(psh, cmd, &args);
-        }
 }
 
@@ -1188 +1260 @@
                 if (goodname(n->ncmd.args->narg.text))
                         find_command(psh, n->ncmd.args->narg.text, &entry, 0,
-                                     pathval(psh));
+                                         pathval(psh));
 }