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

Timestamp:

Sep 16, 2020, 11:18:31 PM (5 years ago)

Author:

bird

Message:

kash: exec.c/h+eval.c: Fixed no-rehashing-needed optimizations so they work for windows and OS/2 as well (UNIX-specific abspath detection). Cache the suffix found by stat_pc_exec_exts so that we don't have to repeat it 2 microseconds after find_command called it. Use the specialized shfile_stat variants where possible. eval.c: Fixed double free of commandname in evalcommand_doit.

File:

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

trunk/src/kash/eval.c

@@ -1012 +1012 @@
                                         exitshell(psh, psh->exitstatus);
                         }
-                        if (savecmdnamemalloc)
+                        else if (savecmdnamemalloc)
                                 sh_free(psh, savecmdname);
                         if (e != -1) {
@@ -1041 +1041 @@
                                 setvareq(psh, sp->text, VEXPORT|VSTACK);
                         envp = environment(psh);
-                        shellexec(psh, args->argv, envp, args->path, args->cmdentry.u.index);
+                        shellexec(psh, args->argv, envp, args->path,
+                                  args->cmdentry.u.n.index, args->cmdentry.u.n.suffix);
                         break;
                 }
@@ -1421 +1422 @@
                 for (sp = psh->cmdenviron; sp; sp = sp->next)
                         setvareq(psh, sp->text, VEXPORT|VSTACK);
-                shellexec(psh, argv + 1, environment(psh), pathval(psh), 0);
+                shellexec(psh, argv + 1, environment(psh), pathval(psh), 0, -1);
         }
         return 0;