Changeset 3449 in kBuild for trunk/src/kash/parser.c

Timestamp:

Sep 13, 2020 11:17:09 AM (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/parser.c (modified) (2 diffs)

trunk/src/kash/parser.c

@@ -1199 +1199 @@
         union node *np;
         char fd = *out;
-        char dummy[   sizeof(struct nfile) >= sizeof(struct ndup)
-                   && sizeof(struct nfile) >= sizeof(struct nhere) ? 1 : 0];
+        char dummy[   sizeof(struct ndup) >= sizeof(struct nfile)
+                   && sizeof(struct ndup) >= sizeof(struct nhere) ? 1 : 0];
         (void)dummy;
 
-        np = (union node *)stalloc(psh, sizeof (struct nfile));
-        np->nfile.expfname = NULL;
+        np = (union node *)stalloc(psh, sizeof (struct ndup));
         if (c == '>') {
                 np->nfile.fd = 1;
@@ -1899 +1898 @@
                                 ret->nfile.next      = copyparsetree(psh, src->nfile.next);
                                 ret->nfile.fname     = copyparsetree(psh, src->nfile.fname);
-                                /** @todo complicated, we should copy it in some contexts but no all. sigh.  */
-                                ret->nfile.expfname  = stsavestr(psh, src->nfile.expfname);
                                 break;