Changeset 208 for trunk/src/helpers/apps.c

Timestamp:

Aug 13, 2002, 9:51:19 PM (23 years ago)

Author:

umoeller

Message:

Minor updates.

File:

• trunk/src/helpers/apps.c (modified) (3 diffs)

trunk/src/helpers/apps.c

@@ -850 +850 @@
  *@@changed V0.9.12 (2001-05-27) [umoeller]: moved from winh.c to apps.c
  *@@changed V0.9.20 (2002-07-03) [umoeller]: now always qualifying executable to fix broken BAT files
+ *@@changed V0.9.21 (2002-08-12) [umoeller]: this didn't work for batch and cmd files that had "+" characters in their full path, fixed
  */
 
@@ -866 +867 @@
     PSZ     pszOldParams = NULL;
     ULONG   ulOldParamsLength = pstrParams->ulLength;
+    BOOL    fQuotes = FALSE;
+
     if (ulOldParamsLength)
         // we have parameters already:
@@ -873 +876 @@
     // set new params to "/C filename.cmd"
     xstrcpy(pstrParams, "/C ", 0);
+
+    // if the path has spaces, or other invalid characters,
+    // include it in quotes V0.9.21 (2002-08-12) [umoeller]
+    if (fQuotes = !!strpbrk(pProgDetails->pszExecutable, " +&|"))
+        xstrcatc(pstrParams, '"');
+
+    #ifdef DEBUG_PROGRAMSTART
+        _PmpfF(("fQuotes (parameters need quotes) is %d", fQuotes));
+    #endif
+
     xstrcat(pstrParams,
             pProgDetails->pszExecutable,
             0);
+
+    if (fQuotes)
+        xstrcatc(pstrParams, '"');      // V0.9.21 (2002-08-12) [umoeller]
 
     if (pszOldParams)