Changeset 3568

Timestamp:

Jul 9, 2022, 3:24:31 PM (3 years ago)

Author:

bird

Message:

kash: Corrected has_ext for when suffix is set via the suffix index in shellexec. Removed bogus assertion from tryexec.

File:

• trunk/src/kash/exec.c (modified) (4 diffs)

trunk/src/kash/exec.c

@@ -235 +235 @@
                         memcpy(cmdname, argv0, argv0len);
                         memcpy(cmdname + argv0len, g_exe_suffixes[suffix], sufflen + 1);
+                        tryexec(psh, cmdname, argv, envp, 1);
                 } else
 #endif
@@ -240 +241 @@
                         cmdname = stalloc(psh, argv0len + 5);
                         memcpy(cmdname, argv0, argv0len + 1);
-                }
-                tryexec(psh, cmdname, argv, envp, has_ext);
+                        tryexec(psh, cmdname, argv, envp, has_ext);
+                }
                 TRACE((psh, "shellexec: cmdname=%s\n", cmdname));
                 stunalloc(psh, cmdname);
@@ -263 +264 @@
                         if (--idx < 0 && psh->pathopt == NULL) {
 #ifdef PC_EXE_EXTS
-                                if (!has_ext && idx == -1 && suffix && (unsigned)suffix < K_ELEMENTS(g_exe_suffixes))
+                                if (!has_ext && idx == -1 && suffix && (unsigned)suffix < K_ELEMENTS(g_exe_suffixes)) {
                                         strcat(cmdname, g_exe_suffixes[suffix]);
-#endif
-                                tryexec(psh, cmdname, argv, envp, has_ext);
+                                        tryexec(psh, cmdname, argv, envp, 1);
+                                } else
+#endif
+                                        tryexec(psh, cmdname, argv, envp, has_ext);
                                 if (errno != ENOENT && errno != ENOTDIR)
                                         e = errno;
@@ -305 +308 @@
         if (!has_ext) {
                 int suffix;
-                int isreg = stat_pc_exec_exts(psh, cmd, 0, &suffix);
-                kHlpAssert(isreg > 0);
+                stat_pc_exec_exts(psh, cmd, 0, &suffix);
         }
 #endif