Changeset 1919

Timestamp:

Nov 11, 2025, 5:42:02 PM (9 hours ago)

Author:

Gregg Young

Message:

Fix issue with command lines that contain 2 (or more) executable extentions Ticket #536

File:

• trunk/dll/pathutil.c (modified) (2 diffs)

trunk/dll/pathutil.c

@@ -48 +48 @@
 #include "stristr.h"                    //stristr
 
+#ifdef PMPRINTF
+#define  _PMPRINTF_                     // Enable debug macros
+#include "PMPRINTF.H"
+#endif
+
 static PSZ pszSrcFile = __FILE__;
 
@@ -200 +205 @@
     offsetbat = stristr(pszCmdLine_, PCSZ_DOTBAT);
     if (offsetexe)
-      offset = offsetexe;
-    else {
-      if (offsetcom)
-        offset = offsetcom;
-      else {
-        if (offsetcmd)
-          offset = offsetcmd;
-        else {
-          if (offsetbtm)
-            offset = offsetbtm;
-          else {
-            if (offsetbat)
-              offset = offsetexe;
-          }
-        }
+        offset = offsetexe;
+    if (offsetcom && !offset)
+        offset = offsetcom;
+    else if (offsetcom) {
+      if (offsetcom < offset) {
+        offset = offsetcom;
+        offsetexe = '\0';
+      }
+    }
+    if (offsetcmd && !offset)
+        offset = offsetcmd;
+    else if (offsetcmd) {
+      if (offsetcmd < offset) {
+        offset = offsetcmd;
+        offsetcom = offsetexe = '\0';
+      }
+    }
+    if (offsetbtm && !offset)
+        offset = offsetbtm;
+    else if (offsetbtm) {
+      if (offsetbtm < offset) {
+        offset = offsetbtm;
+        offsetcom = offsetexe = '\0';
+      }
+    }
+    if (offsetbat && !offset)
+        offset = offsetbat;
+    else if (offsetbat) {
+      if (offsetbat < offset) {
+        offset = offsetbat;
+        offsetcom = offsetexe = '\0';
       }
     }