Changeset 3501 for trunk/src/kernel32/winexepeldr.cpp

Timestamp:

May 9, 2000, 8:56:59 PM (25 years ago)

Author:

sandervl

Message:

lots of changes/fixes

File:

• trunk/src/kernel32/winexepeldr.cpp (modified) (2 diffs)

trunk/src/kernel32/winexepeldr.cpp

@@ -1 @@
-/* $Id: winexepeldr.cpp,v 1.8 2000-04-14 22:35:28 sandervl Exp $ */
+/* $Id: winexepeldr.cpp,v 1.9 2000-05-09 18:56:09 sandervl Exp $ */
 
 /*
@@ -67 +67 @@
   }
 
-  szFullCmdLine = (char *)malloc(strlen(szFileName) + 1 + strlen(szCmdLine) + 1);
-  strcpy(szFullCmdLine, szFileName);
+  //exe length + space + (possibly) 2x'"' + cmd line length + 0 terminator
+  szFullCmdLine = (char *)malloc(strlen(szFileName) + 3 + strlen(szCmdLine) + 1);
+  //Enclose executable name in quotes if it (or it's directory) contains spaces
+  if(strchr(szFileName, ' ') != NULL) {
+        sprintf(szFullCmdLine, "\"%s\"", szFileName);
+  }
+  else  strcpy(szFullCmdLine, szFileName);
   strcat(szFullCmdLine, " ");
   strcat(szFullCmdLine, szCmdLine);