Changeset 22028 for trunk/src

Timestamp:

Oct 22, 2012, 2:48:13 PM (13 years ago)

Author:

dmik

Message:

pe: A better fix for adding .EXE than r22016.

It will only add .EXE if there is no (any) extention already specified,
regardless of whether the path is present or not. This matches the
behavior of CMD.EXE on both Windows and OS/2.

Location:

trunk/src/peldr

Files:

• helpers.c (modified) (1 diff)
• helpers.h (modified) (1 diff)
• pe.c (modified) (1 diff)

trunk/src/peldr/helpers.c

@@ -75 +75 @@
 }
 
+const char *str_find_last_char(const char *s, int c)
+{
+    int len = strlen (s);
+    const char *e = s + len;
+    while (e >= s && *e != c)
+        e--;
+    return e < s ? s + len : e;
+}
+
 //
 // BEGIN: taken from _ras.cpp

trunk/src/peldr/helpers.h

@@ -20 +20 @@
 const char *str_skip_char(const char *s, int c);
 const char *str_find_char(const char *s, int c);
+const char *str_find_last_char(const char *s, int c);
 int vsnprintf (char *buf, int n, const char *fmt, va_list args);
 int snprintf(char *buf, int n, const char *fmt, ...);

trunk/src/peldr/pe.c

@@ -199 +199 @@
         win32cmdline = pszTemp;
 
-        // add the .EXE extension if missing (only if there's no path)
-        if (*str_find_char(exeName, '.') == '\0' &&
-            *str_find_char(exeName, '\\') == '\0' &&
-            *str_find_char(exeName, '/') == '\0')
+        // add the .EXE extension if missing (only if there's no extension already)
+        if (*str_find_last_char(exeName, '.') == '\0')
         {
             int i = strlen(exeName);
-            if (i < 4 || !((exeName[i-1] == 'E' || exeName[i-1] == 'e') &&
-                           (exeName[i-2] == 'X' || exeName[i-2] == 'x') &&
-                           (exeName[i-3] == 'E' || exeName[i-3] == 'e') &&
-                           exeName[i-4] == '.'))
-            {
-                if (i + 4 < CCHMAXPATH)
-                    strcat(exeName, ".exe");
-            }
+            if (i + 4 < CCHMAXPATH)
+                strcat(exeName, ".exe");
         }