Changeset 3827 for trunk/src

Timestamp:

Jul 15, 2000, 7:12:02 PM (25 years ago)

Author:

sandervl

Message:

fixed support for paths with spaces

File:

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

trunk/src/peldr/pe.cpp

@@ -1 @@
-/* $Id: pe.cpp,v 1.18 2000-07-15 09:13:54 sandervl Exp $ */
+/* $Id: pe.cpp,v 1.19 2000-07-15 17:12:02 sandervl Exp $ */
 
 /*
@@ -85 +85 @@
  char  *cmdline, *win32cmdline;
  BOOL   fQuote = FALSE;
+ int    nrTries = 1;
 
   if(argc >= 2) {
         if(DosGetInfoBlocks(&ptib, &ppib) == 0) {
+tryagain:
                 cmdline = ppib->pib_pchcmd;
                 cmdline += strlen(cmdline)+1;   //skip pe.exe
@@ -104 +106 @@
                 }
                 else {
-                        while(*p != ' ' && *p != 0) p++;
+                        for(int i=0;i<nrTries;i++) {
+                                while(*p != ' ' && *p != 0) p++;
+                                if(*p == 0) break;
+                                if(i != nrTries-1) {
+                                        while(*p == ' ' && *p != 0) p++;
+                                }
+                        }
                 }
                 *p = 0;
@@ -135 +143 @@
                         strcpy(exeName, fullpath);
                 }
+                FILESTATUS3 fstat3;
+                if(DosQueryPathInfo(exeName, FIL_STANDARD, (PVOID)&fstat3, sizeof(fstat3))) 
+                {
+                        nrTries++;
+                        if(*win32cmdline != NULL) {
+                                goto tryagain;
+                        }
+                }
         }
         else {//should never happen!
+filenotfound:
                 DebugInt3();
                 rc = DosLoadModule(exeName, sizeof(exeName), "PMWIN.DLL", &hmodPMWin);