Changeset 22032 for trunk/src

Timestamp:

Oct 22, 2012, 10:04:43 PM (13 years ago)

Author:

dmik

Message:

pe: Fix r22028.

File:

• trunk/src/peldr/pe.c (modified) (2 diffs)

trunk/src/peldr/pe.c

@@ -199 +199 @@
         win32cmdline = pszTemp;
 
+        // get the filename component
+        pszTemp = exeName + strlen(exeName) - 1;
+        while (pszTemp >= exeName && (*pszTemp != '\\' && *pszTemp != '/'))
+            --pszTemp;
+        ++pszTemp;
+
         // add the .EXE extension if missing (only if there's no extension already)
-        if (*str_find_last_char(exeName, '.') == '\0')
+        if (*str_find_char(pszTemp, '.') == '\0')
         {
             int i = strlen(exeName);
@@ -208 +214 @@
 
         // try to locate the executable
-        pszTemp = exeName + strlen(exeName) - 1;
-        while (pszTemp >= exeName && (*pszTemp != '\\' && *pszTemp != '/'))
-            --pszTemp;
-        if (pszTemp < exeName)
+        if (pszTemp == exeName)
         {
             // no path information, perform a search