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

Timestamp:

Sep 13, 2020, 1:17:09 PM (5 years ago)

Author:

bird

Message:

kash: Eliminate the 'temp' node field in nfile so we can share node trees later.

File:

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

trunk/src/kash/eval.c

@@ -41 +41 @@
 #endif
 
+#include <assert.h>
+#include <stddef.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -103 +105 @@
 STATIC void evalcase(shinstance *, union node *, int);
 STATIC void evalsubshell(shinstance *, union node *, int);
-STATIC void expredir(shinstance *, union node *);
-STATIC void expredircleanup(shinstance *, union node *);
+STATIC unsigned expredir(shinstance *, union node *);
 STATIC void evalpipe(shinstance *, union node *);
 STATIC void evalcommand(shinstance *, union node *, int, struct backcmd *);
@@ -247 +248 @@
                 evaltree(psh, n->nbinary.ch2, flags);
                 break;
-        case NREDIR:
-                expredir(psh, n->nredir.redirect);
+        case NREDIR: {
+                unsigned const oldfnames = expredir(psh, n->nredir.redirect);
                 redirect(psh, n->nredir.redirect, REDIR_PUSH);
                 evaltree(psh, n->nredir.n, flags);
                 popredir(psh);
-                expredircleanup(psh, n->nredir.redirect);
+                expredircleanup(psh, oldfnames);
                 break;
+        }
         case NSUBSHELL:
                 evalsubshell(psh, n, flags);
@@ -450 +452 @@
         struct job *jp;
         int backgnd = (n->type == NBACKGND);
-
-        expredir(psh, n->nredir.redirect);
+        unsigned expfnamedepth;
+
+        expfnamedepth = expredir(psh, n->nredir.redirect);
         INTOFF;
         jp = makejob(psh, n, 1);
@@ -474 +477 @@
         if (! backgnd)
                 psh->exitstatus = waitforjob(psh, jp);
+        expredircleanup(psh, expfnamedepth);
         INTON;
-        expredircleanup(psh, n->nredir.redirect);
 }
 
@@ -484 +487 @@
  */
 
-STATIC void
+STATIC unsigned
 expredir(shinstance *psh, union node *n)
 {
         union node *redir;
-
-        for (redir = n ; redir ; redir = redir->nfile.next) {
+        redirexpfnames *expfnames;
+        unsigned i;
+
+        /* We typically end up here w/o redirections. */
+        if (!n)
+            return !(expfnames = psh->expfnames) ? 0 : expfnames->depth + 1;
+
+        /* Prepare a table for the expanded names. */
+        i = 0;
+        for (redir = n; redir ; redir = redir->nfile.next)
+            i++;
+        expfnames = stalloc(psh, offsetof(redirexpfnames, names) +  sizeof(expfnames->names[0]) * i);
+        expfnames->count = i;
+        TRACE2((psh, "expredir: %p: count=%u\n", expfnames, i));
+
+        /* Do the expansion. */
+        for (redir = n, i = 0 ; redir ; redir = redir->nfile.next, i++) {
                 struct arglist fn;
                 fn.lastp = &fn.list;
@@ -499 +517 @@
                 case NAPPEND:
                         expandarg(psh, redir->nfile.fname, &fn, EXP_TILDE | EXP_REDIR);
-                        redir->nfile.expfname = fn.list->text;
+                        expfnames->names[i] = fn.list->text;
                         break;
                 case NFROMFD:
@@ -507 +525 @@
                                 fixredir(psh, redir, fn.list->text, 1);
                         }
+                        expfnames->names[i] = NULL;
                         break;
-                }
-        }
+                default:
+                        assert(0);
+                        expfnames->names[i] = NULL;
+                        break;
+                }
+        }
+        assert(i == expfnames->count);
+
+        /* Do the linking at the end, as nesting happens when we expand backtick arguments. */
+        expfnames->prev = psh->expfnames;
+        psh->expfnames = expfnames;
+        return expfnames->depth = psh->expfnames ? psh->expfnames->depth + 1 : 1;
 }
 
 STATIC void
-expredircleanup(shinstance *psh, union node *n)
-{
-        for (; n ; n = n->nfile.next) {
-                struct arglist fn;
-                fn.lastp = &fn.list;
-                switch (n->type) {
-                case NFROMTO:
-                case NFROM:
-                case NTO:
-                case NCLOBBER:
-                case NAPPEND:
-                        n->nfile.expfname = NULL;
-                        break;
-                }
-        }
+expredircleanup(shinstance *psh, unsigned depth)
+{
+        redirexpfnames *expfnames = psh->expfnames;
+        assert(expfnames == NULL ? depth == 0 : expfnames->depth == depth || expfnames->depth + 1 == depth);
+        while (expfnames && expfnames->depth >= depth)
+            expfnames = psh->expfnames = expfnames->prev;
 }
 
@@ -1111 +1131 @@
         struct strlist *sp;
         const char *path = pathval(psh);
+        unsigned expfnamedepth;
 
         /* First expand the arguments. */
@@ -1134 +1155 @@
         *arglist.lastp = NULL;
 
-        expredir(psh, cmd->ncmd.redirect);
+        expfnamedepth = expredir(psh, cmd->ncmd.redirect);
 
         /* Now do the initial 'name=value' ones we skipped above */
@@ -1254 +1275 @@
                            &args, sizeof(args), evalcommand_setup_child);
                 evalcommand_parent(psh, flags, args.lastarg, &args.smark, mode, jp,
-                                                   args.pip, backcmd);
+                                   args.pip, backcmd);
 #else
                 if (forkshell(psh, jp, cmd, mode) != 0) {
                         evalcommand_parent(psh, flags, args.lastarg, &args.smark, mode, jp,
                                                            args.pip, backcmd);
-                        expredircleanup(psh, cmd->ncmd.redirect);
+                        expredircleanup(psh, expfnamedepth);
                         return; /* at end of routine */
                 }
@@ -1270 +1291 @@
                 evalcommand_doit(psh, cmd, &args);
         }
-        expredircleanup(psh, cmd->ncmd.redirect);
+        expredircleanup(psh, expfnamedepth);
 }