Changeset 3781 for trunk/src

Timestamp:

Jul 1, 2000, 11:50:24 AM (25 years ago)

Author:

sandervl

Message:

cmd line parser bug fixed

File:

• trunk/src/peldr/pe.cpp (modified) (4 diffs)

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.16 2000-04-14 22:56:11 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.17 2000-07-01 09:50:24 sandervl Exp $ */
 
 /*
@@ -84 +84 @@
  PPIB   ppib;
  char  *cmdline, *win32cmdline;
+ BOOL   fQuote = FALSE;
 
   if(argc >= 2) {
@@ -90 +91 @@
                 cmdline += strlen(cmdline)+1;   //skip pe.exe
                 while(*cmdline == ' ')  cmdline++; //skip leading space
-                if(*cmdline == '"')     cmdline++;
+                if(*cmdline == '"') {
+                        cmdline++;
+                        fQuote = TRUE;
+                }
                 win32cmdline = cmdline;
 
                 strncpy(exeName, cmdline, sizeof(exeName)-1);
                 exeName[sizeof(exeName)-1] = 0;
+                char *p = exeName;
+                if(fQuote) {
+                        while(*p != '"' && *p != 0) p++;
+                }
+                else {
+                        while(*p != ' ' && *p != 0) p++;
+                }
+                *p = 0;
                 strupr(exeName);
                 cmdline = strstr(exeName, ".EXE");
@@ -102 +114 @@
                 }
                 else {
-                        cmdline = exeName;
-                        while(*cmdline && *cmdline != ' ')      cmdline++; //skip exe name
-                        *cmdline = 0;
-                        win32cmdline += ((ULONG)cmdline - (ULONG)exeName);
+                        win32cmdline += strlen(exeName);
                         if(strstr(exeName, ".") == NULL) {
                                 strcat(exeName, ".EXE");
                         }
                 }
+                if(fQuote) win32cmdline++;
                 while(*win32cmdline == ' ') win32cmdline++; //skip spaces