Changeset 3453 in kBuild for trunk/src/kash/eval.c

Timestamp:

Sep 14, 2020 9:28:42 AM (5 years ago)

Author:

bird

Message:

kash: eval: Call expredircleanup before we pop the allocator stack.

File:

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

trunk/src/kash/eval.c

@@ -818 +818 @@
 /* Both child and parent exits thru here. */
 STATIC void
-evalcommand_out(shinstance *psh, int flags, char *lastarg, struct stackmark *smarkp)
+evalcommand_out(shinstance *psh, int flags, char *lastarg, unsigned expfnamedepth, struct stackmark *smarkp)
 {
         if (lastarg)
@@ -826 +826 @@
                  */
                 setvar(psh, "_", lastarg, 0);
+        expredircleanup(psh, expfnamedepth);
         popstackmark(psh, smarkp);
 
@@ -835 +836 @@
 /* Called if we forkshell(). */
 STATIC void
-evalcommand_parent(shinstance *psh, int flags, char *lastarg, struct stackmark *smarkp,
+evalcommand_parent(shinstance *psh, int flags, char *lastarg, unsigned expfnamedepth, struct stackmark *smarkp,
                    int mode, struct job *jp, int pip[2], struct backcmd *backcmd)
 {
@@ -847 +848 @@
         FORCEINTON;
 
-        evalcommand_out(psh, flags, lastarg, smarkp);
+        evalcommand_out(psh, flags, lastarg, expfnamedepth, smarkp);
 }
 
@@ -853 +854 @@
 {
         struct stackmark smark;
+        unsigned expfnamedepth;
 
         struct backcmd *backcmd;
@@ -1044 +1046 @@
         }
 
-        evalcommand_out(psh, args->flags, args->lastarg, &args->smark);
+        evalcommand_out(psh, args->flags, args->lastarg, args->expfnamedepth, &args->smark);
 }
 
@@ -1131 +1133 @@
         struct strlist *sp;
         const char *path = pathval(psh);
-        unsigned expfnamedepth;
 
         /* First expand the arguments. */
@@ -1155 +1156 @@
         *arglist.lastp = NULL;
 
-        expfnamedepth = expredir(psh, cmd->ncmd.redirect);
+        args.expfnamedepth = expredir(psh, cmd->ncmd.redirect);
 
         /* Now do the initial 'name=value' ones we skipped above */
@@ -1221 +1222 @@
                                 psh->exitstatus = 127;
                                 flushout(&psh->errout);
-                                evalcommand_out(psh, flags, args.lastarg, &args.smark);
+                                evalcommand_out(psh, flags, args.lastarg, args.expfnamedepth, &args.smark);
                                 return;
                         }
@@ -1274 +1275 @@
                 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);
+                evalcommand_parent(psh, flags, args.lastarg, args.expfnamedepth,
+                                   &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,
-                                                           args.pip, backcmd);
-                        expredircleanup(psh, expfnamedepth);
+                        evalcommand_parent(psh, flags, args.lastarg, args.expfnamedepth,
+                                           &args.smark, mode, jp, args.pip, backcmd);
                         return; /* at end of routine */
                 }
@@ -1291 +1291 @@
                 evalcommand_doit(psh, cmd, &args);
         }
-        expredircleanup(psh, expfnamedepth);
 }