Changeset 918 for trunk/dll/systemf.c

Timestamp:

Jan 12, 2008, 9:16:37 PM (18 years ago)

Author:

Gregg Young

Message:

Fix CheckApp_QuoteAddExe to return a pointer on the stack instead of a string. Use MAXCOMLINESTRG for command line length.

File:

• trunk/dll/systemf.c (modified) (13 diffs)

trunk/dll/systemf.c

@@ -43 +43 @@
 static PSZ pszSrcFile = __FILE__;
 
-#define MAXSTRG (4096)                  /* used to build command line strings */
-
 /**
  * Bring session foreground
@@ -83 +81 @@
   /* executes the command once for all files in list */
 
-  char path[CCHMAXPATH], commandline[2048], modpath[CCHMAXPATH], listfile[CCHMAXPATH],
+  char path[CCHMAXPATH], commandline[MAXCOMLINESTRG], modpath[CCHMAXPATH], listfile[CCHMAXPATH],
        *p, *pp, drive, *file, *ext, *dot;
   register int x;
@@ -676 +674 @@
 
   rc = DosAllocMem((PVOID)&pszPgm,
-                   MAXSTRG,
+                   MAXCOMLINESTRG,
                    PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
   if (rc) {
@@ -721 +719 @@
       if (temp) {
         rc = DosAllocMem((PVOID)&pszArgs,
-                         MAXSTRG * 2,
+                         MAXCOMLINESTRG * 2,
                          PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
         if (rc)
@@ -854 +852 @@
       if (~type & FULLSCREEN)
         type |= WINDOWED;
-      rc = DosAllocMem((PVOID) & pszArgs, MAXSTRG * 2,
+      rc = DosAllocMem((PVOID) & pszArgs, MAXCOMLINESTRG * 2,
                        PAG_COMMIT | OBJ_TILE | PAG_READ | PAG_WRITE);
       if (rc) {
@@ -1237 +1235 @@
     ulOptions |= SAF_STARTCHILDAPP;
 
-  executable = xmallocz(MAXSTRG,pszSrcFile,__LINE__);
+  executable = xmallocz(MAXCOMLINESTRG, pszSrcFile, __LINE__);
   if (executable) {
     va_start(parguments, formatstring);
@@ -1244 +1242 @@
     strip_lead_char(" \t", executable);
     if (*executable) {
-      parameters = xmalloc(MAXSTRG,pszSrcFile,__LINE__);
+      parameters = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
       if (parameters) {
         p = executable;
@@ -1318 +1316 @@
 }
 
-PSZ CheckApp_QuoteAddExe(PSZ pszPgm)
+PSZ CheckApp_QuoteAddExe(PSZ pszQuotedCompletePgm, PSZ pszPgm)
 {
-  // 11 Jan 08 SHL fixme to not return quoted string on stack
-  // 11 Jan 08 SHL fixme to have javadoc comments
-  char szTempPgm[2048], tempcom[2048], temparg[2048];
+  char tempcom[MAXCOMLINESTRG], temparg[MAXCOMLINESTRG];
   char *offset = '\0', *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
   APIRET ret;
@@ -1331 +1327 @@
   HDIR hdirFindHandle = HDIR_CREATE;
   ULONG ulFindCount = 1;
-  PSZ pszQuotedCompletePgm;
+  PSZ pszTempPgm = pszQuotedCompletePgm;
 
   bstrip(pszPgm);
@@ -1396 +1392 @@
       else
         ret = DosQueryAppType(tempcom, &ulAppType);
-      BldQuotedFileName(szTempPgm, tempcom);
+      BldQuotedFileName(pszTempPgm, tempcom);
       //printf("%d A", ret); fflush(stdout);
       if (ret) {
-        ret = saymsg(MB_YESNO,
-                     HWND_DESKTOP,
-                     NullStr,
-                     GetPString(IDS_PROGRAMNOTFOUNDTEXT),
-                     pszPgm);
-        if (ret == MBID_YES)
-          pszQuotedCompletePgm = pszPgm;
-        else {
-          fCancelAction = TRUE;
-          pszQuotedCompletePgm = pszPgm;
-        }
-      }
-      else {
-        if (temparg[0] != ' ')
-          strcat(szTempPgm, " ");
-        strcat(szTempPgm, temparg);
-        pszQuotedCompletePgm = szTempPgm;
+        ret = saymsg(MB_YESNO,
+                     HWND_DESKTOP,
+                     NullStr,
+                     GetPString(IDS_PROGRAMNOTFOUNDTEXT),
+                     pszPgm);
+        if (ret == MBID_YES){
+          pszTempPgm = pszPgm;
+      }
+        else{
+          fCancelAction = TRUE;
+          pszTempPgm = pszPgm;
+        }
+      }
+      else{
+        if (temparg[0] != ' ')
+          strcat(pszTempPgm, " ");
+        strcat(pszTempPgm, temparg);
       }
 
@@ -1447 +1443 @@
         }
       }
-      if (!ret) {
-        BldQuotedFileName(szTempPgm, tempcom);
-        strcpy(temparg, pszPgm + strlen(tempcom) - 3);
-        if ((temparg[0] == '\"' && temparg[1] == ' ') ||
-             !strstr(pszPgm, "\\:" ) ||
-             strchr(temparg, '\"') == strrchr(temparg, '\"'))
-          remove_first_occurence_of_character("\"", temparg);
-        if (strchr(temparg, '\"') != strrchr(temparg, '\"'))
-          saymsg(MB_OK, HWND_DESKTOP,
-                 NullStr,
-                 GetPString(IDS_QUOTESINARGSTEXT),
-                 pszPgm);
-        if (temparg[0] != ' ')
-          strcat(szTempPgm, " ");
-        strcat(szTempPgm, temparg);
-        pszQuotedCompletePgm = szTempPgm;
+      if (!ret){
+        BldQuotedFileName(pszTempPgm, tempcom);
+        strcpy(temparg, pszPgm + strlen(tempcom) - 3);
+        if ((temparg[0] == '\"' && temparg[1] == ' ') ||
+             !strstr(pszPgm, "\\:" ) ||
+             strchr(temparg, '\"') == strrchr(temparg, '\"'))
+          remove_first_occurence_of_character("\"", temparg);
+        if (strchr(temparg, '\"') != strrchr(temparg, '\"'))
+          saymsg(MB_OK, HWND_DESKTOP,
+                 NullStr,
+                 GetPString(IDS_QUOTESINARGSTEXT),
+                 pszPgm);
+        if (temparg[0] != ' ')
+          strcat(pszTempPgm, " ");
+        strcat(pszTempPgm, temparg);
       }
       else {
-        ret = saymsg(MB_OK,
-                     HWND_DESKTOP,
-                     NullStr,
-                     GetPString(IDS_PROGRAMNOTEXE2TEXT),
-                     pszPgm);
-          fCancelAction = TRUE;
-          pszQuotedCompletePgm = pszPgm;
+        ret = saymsg(MB_OK,
+                     HWND_DESKTOP,
+                     NullStr,
+                     GetPString(IDS_PROGRAMNOTEXE2TEXT),
+                     pszPgm);
+          fCancelAction = TRUE;
+          pszTempPgm = pszPgm;
       }
     }
@@ -1495 +1490 @@
                          ulResultBufLen, &ulFindCount, FIL_STANDARD);
 
-    BldQuotedFileName(szTempPgm, tempcom);
+    BldQuotedFileName(pszTempPgm, tempcom);
     //printf("%d %s ", ret, tempcom); fflush(stdout);
     if (ret) {
@@ -1512 +1507 @@
     }
     ret = saymsg(MB_YESNOCANCEL,
-                   HWND_DESKTOP,
-                   NullStr,
-                   GetPString(IDS_PROGRAMNOTEXE3TEXT),
-                   pszPgm, szTempPgm);
-      if (ret == MBID_YES) {
-        if (temparg[0] != ' ')
-          strcat(szTempPgm, " ");
-        strcat(szTempPgm, temparg);
-        pszQuotedCompletePgm = szTempPgm;
-      }
-      if (ret == MBID_CANCEL) {
-        fCancelAction = TRUE;
-        pszQuotedCompletePgm = pszPgm;
-      }
-      else
-        pszQuotedCompletePgm = pszPgm;
-    }
-    return pszQuotedCompletePgm;
+                   HWND_DESKTOP,
+                   NullStr,
+                   GetPString(IDS_PROGRAMNOTEXE3TEXT),
+                   pszPgm, pszTempPgm);
+      if (ret == MBID_YES){
+        if (temparg[0] != ' ')
+          strcat(pszTempPgm, " ");
+        strcat(pszTempPgm, temparg);
+      }
+      if (ret == MBID_CANCEL){
+        fCancelAction = TRUE;
+        pszTempPgm = pszPgm;
+      }
+    }
   }
-  return pszPgm;
+  else
+    pszTempPgm = pszPgm;
+  return pszQuotedCompletePgm;
 }