Changeset 888 for trunk/dll/systemf.c

Timestamp:

Dec 22, 2007, 11:02:11 PM (18 years ago)

Author:

Gregg Young

Message:

runemf2 now quotes executable strings if needed (Ticket 180); it also reports where it was called from on errors

File:

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

trunk/dll/systemf.c

@@ -71 +71 @@
 
 int ExecOnList(HWND hwnd, char *command, int flags, char *tpath,
-               char **list, char *prompt)
+               char **list, char *prompt, PCSZ pszCallingFile, UINT uiLineNumber)
 {
   /* executes the command once for all files in list */
@@ -591 +591 @@
       ex.flags = flags;
     ex.flags &= (~PROMPT);
-    return runemf2(ex.flags, hwnd, path,
+    return runemf2(ex.flags, hwnd, pszCallingFile, uiLineNumber, path,
                    (*ex.environment) ? ex.environment : NULL,
                    "%s", commandline);
@@ -599 +599 @@
 //== runemf2() run requested app, return -1 if problem starting else return app rc ==
 
-int runemf2(int type, HWND hwnd, char *pszDirectory, char *pszEnvironment,
+int runemf2(int type, HWND hwnd, PCSZ pszCallingFile, UINT uiLineNumber,
+            char *pszDirectory, char *pszEnvironment,
             char *formatstring,...)
 {
@@ -605 +606 @@
 
    * status = runemf2(SEPARATE | WINDOWED,
-   *                  hwnd,
+   *                  hwnd, pszCallingFile, __LINE__,
    *                  NullStr,
    *                  NULL,
@@ -613 +614 @@
    *
    * use (HWND)0 for hwnd if window handle not handy.
+   * pszCallingFile and __LINE__ are used to determine caller for easier error tracking
    */
 
@@ -634 +636 @@
   BOOL useTermQ = FALSE;
   char szTempdir[CCHMAXPATH];
+  char szTempPgm[CCHMAXPATH], tempcom[1024], temparg[1024], buf[10] = " &|<>";
+  char *offset, *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
+  UINT offsetquote;
 
   typedef struct {
@@ -675 +680 @@
   *pszPgm = 0;
   va_start(parguments,
-           formatstring);
+           formatstring);
   vsprintf(pszPgm,
            formatstring,
-           parguments);
+           parguments);
   va_end(parguments);
-
+  offsetexe = strstr(pszPgm, ".exe");
+  offsetcmd = strstr(pszPgm, ".cmd");
+  offsetcom = strstr(pszPgm, ".com");
+  offsetbtm = strstr(pszPgm, ".btm");
+  offsetbat = strstr(pszPgm, ".bat");
+  if (offsetexe)
+    offset = offsetexe;
+  else if (offsetcom)
+    offset = offsetcom;
+  else if (offsetcmd)
+    offset = offsetcmd;
+  else if (offsetbtm)
+    offset = offsetbtm;
+  else if (offsetbat)
+    offset = offsetbat;
+  else
+    offset = NULL;
+  offsetquote = strcspn(pszPgm, buf);
+  if (pszPgm[0] != '\"' && offsetquote < offset - pszPgm && offsetquote != NULL){
+    strcpy(tempcom, pszPgm);
+    tempcom[offset + 4 - pszPgm] = '\0';
+    strcpy (temparg, &pszPgm[offset + 4 - pszPgm]);
+    pszDirectory = szTempdir;
+    strcpy(pszDirectory, tempcom);
+    offset = strrchr(pszDirectory, '\\');
+    pszDirectory[offset +1 - pszDirectory] = '\0';
+    BldQuotedFileName(szTempPgm, tempcom);
+    strcat(szTempPgm, temparg);
+    memcpy(pszPgm, szTempPgm, 1024);
+    //printf("%s\n %s\n%s %s\n %d %d",
+    //       pszPgm, szTempPgm, tempcom, temparg, offset, offsetquote); fflush(stdout);
+  }
   if (pszEnvironment) {
     p = &pszEnvironment[strlen(pszEnvironment)] + 1;
@@ -789 +825 @@
           Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,
                     GetPString(IDS_DOSQAPPTYPEFAILEDTEXT),
-                    pszPgm);
+                    pszPgm, pszCallingFile, __LINE__);
           DosFreeMem(pszPgm);
           if (pszArgs)
@@ -801 +837 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_APPTYPEUNEXPECTEDTEXT),
-                          ulAppType, pszPgm);
+                          ulAppType, pszPgm, pszCallingFile, __LINE__);
             if (pszPgm)
               DosFreeMem(pszPgm);
@@ -813 +849 @@
             Runtime_Error(pszSrcFile, __LINE__,
                           GetPString(IDS_APPTYPEUNEXPECTEDTEXT),
-                          ulAppType, pszPgm);
+                          ulAppType, pszPgm, pszCallingFile, __LINE__);
             if (pszPgm)
               DosFreeMem(pszPgm);
@@ -834 +870 @@
         if (ret) {
           Dos_Error(MB_ENTER,ret,hwnd,pszSrcFile,__LINE__,
-                    GetPString(IDS_DOSEXECPGMFAILEDTEXT), pszPgm);
+                    GetPString(IDS_DOSEXECPGMFAILEDTEXT), pszPgm,
+                    pszCallingFile, __LINE__);
         }
       }
@@ -903 +940 @@
       }
 
-      /* goddamned OS/2 limit */
+      // goddamned OS/2 limit
 
       if (strlen(pszPgm) + strlen(pszArgs) > 1024)
@@ -922 +959 @@
           *pszDirectory)
         switch_to(szSavedir);
-      if (rc) {
+      if (rc){
         Dos_Error(MB_CANCEL,rc,hwnd,pszSrcFile,__LINE__,
                   GetPString(IDS_DOSQAPPTYPEFAILEDTEXT),
-                  pszPgm);
+                  pszPgm, pszCallingFile, __LINE__);
         DosFreeMem(pszPgm);
         if (pszArgs)
@@ -937 +974 @@
           Runtime_Error(pszSrcFile, __LINE__,
                         GetPString(IDS_APPTYPEUNEXPECTEDTEXT),
-                        pszPgm);
+                        pszPgm, pszCallingFile, __LINE__);
           DosFreeMem(pszPgm);
           if (pszArgs)
@@ -1106 +1143 @@
       if (ret && ret != ERROR_SMG_START_IN_BACKGROUND) {
         Dos_Error(MB_CANCEL,ret,hwnd,pszSrcFile,__LINE__,
-                  GetPString(IDS_DOSSTARTSESSIONFAILEDTEXT),pszPgm,pszArgs);
+                  GetPString(IDS_DOSSTARTSESSIONFAILEDTEXT),pszPgm,pszArgs,
+                  pszCallingFile, __LINE__);
       }
       else if (type & WAIT) {