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

trunk/src/kash/redir.c

@@ -43 +43 @@
 #include <sys/types.h>
 #include <limits.h>         /* PIPE_BUF */
+#include <assert.h>
 #include <string.h>
 #include <errno.h>
+#include <stddef.h>
 #include <stdlib.h>
 
@@ -88 +90 @@
 //int fd0_redirected = 0;
 
-STATIC void openredirect(shinstance *, union node *, char[10], int);
+STATIC void openredirect(shinstance *, union node *, char[10], int, const char *);
 STATIC int openhere(shinstance *, union node *);
 
@@ -114 +116 @@
         psh->fd0_redirected = inherit->fd0_redirected;
     }
+
+    /* Copy the expanded redirection filenames (stack), but only the last entry
+       as the subshell does not have the ability to unwind stack in the parent
+       and therefore cannot get to the earlier redirection stuff: */
+    if (inherit->expfnames)
+    {
+        redirexpfnames * const expfnamesrc = inherit->expfnames;
+        unsigned i = expfnamesrc->count;
+        redirexpfnames *dst = stalloc(psh, offsetof(redirexpfnames, names) + sizeof(dst->names[0]) * i);
+        dst->count = i;
+        dst->depth = 1;
+        dst->prev = NULL;
+        while (i-- > 0)
+            dst->names[i] = stsavestr(psh, expfnamesrc->names[i]);
+        psh->expfnames = dst;
+    }
 }
 #endif /* !SH_FORKED_MODE */
@@ -135 +153 @@
         int try;
         char memory[10];        /* file descriptors to write to memory */
+        unsigned idxexpfname;
 
         for (i = 10 ; --i >= 0 ; )
@@ -146 +165 @@
                 psh->redirlist = sv;
         }
-        for (n = redir ; n ; n = n->nfile.next) {
+        idxexpfname = 0;
+        for (n = redir, idxexpfname = 0 ; n ; n = n->nfile.next, idxexpfname++) {
+                assert(idxexpfname < psh->expfnames->count);
                 fd = n->nfile.fd;
                 try = 0;
@@ -160 +181 @@
                                 case EBADF:
                                         if (!try) {
-                                                openredirect(psh, n, memory, flags);
+                                                openredirect(psh, n, memory, flags, psh->expfnames->names[idxexpfname]);
                                                 try++;
                                                 goto again;
@@ -182 +203 @@
                         psh->fd0_redirected++;
                 if (!try)
-                        openredirect(psh, n, memory, flags);
-        }
+                        openredirect(psh, n, memory, flags, psh->expfnames->names[idxexpfname]);
+        }
+        assert(!redir || idxexpfname == psh->expfnames->count);
         if (memory[1])
                 psh->out1 = &psh->memout;
@@ -192 +214 @@
 
 STATIC void
-openredirect(shinstance *psh, union node *redir, char memory[10], int flags)
+openredirect(shinstance *psh, union node *redir, char memory[10], int flags, const char *fname)
 {
         int fd = redir->nfile.fd;
-        char *fname;
         int f;
         int oflags = O_WRONLY|O_CREAT|O_TRUNC;
@@ -208 +229 @@
         switch (redir->nfile.type) {
         case NFROM:
-                fname = redir->nfile.expfname;
                 if ((f = shfile_open(&psh->fdtab, fname, O_RDONLY, 0)) < 0)
                         goto eopen;
                 break;
         case NFROMTO:
-                fname = redir->nfile.expfname;
                 if ((f = shfile_open(&psh->fdtab, fname, O_RDWR|O_CREAT|O_TRUNC, 0666)) < 0)
                         goto ecreate;
@@ -222 +241 @@
                 /* FALLTHROUGH */
         case NCLOBBER:
-                fname = redir->nfile.expfname;
                 if ((f = shfile_open(&psh->fdtab, fname, oflags, 0666)) < 0)
                         goto ecreate;
                 break;
         case NAPPEND:
-                fname = redir->nfile.expfname;
                 if ((f = shfile_open(&psh->fdtab, fname, O_WRONLY|O_CREAT|O_APPEND, 0666)) < 0)
                         goto ecreate;