Changeset 910 for trunk/dll/systemf.c

Timestamp:

Jan 6, 2008, 10:53:49 PM (18 years ago)

Author:

Gregg Young

Message:

Cover case where exe without an extention calls a.cmd file. Cleanup error returns

File:

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

trunk/dll/systemf.c

@@ -1349 +1349 @@
       tempcom[offset + 4 - pszPgm] = '\0';
       strcpy(temparg, &pszPgm[offset + 4 - pszPgm]);
-      /*if ((offsetexe  && !offsetcom && !offsetcmd && !offsetbtm && !offsetbat) ||
-          (offsetcom  && !offsetexe && !offsetcmd && !offsetbtm && !offsetbat) ||
-          (offsetcmd  && !offsetexe && !offsetcom && !offsetbtm && !offsetbat) ||
-          (offsetbtm  && !offsetexe && !offsetcom && !offsetcmd && !offsetbat) ||
-          (offsetbat  && !offsetexe && !offsetcom && !offsetcmd && !offsetbtm))*/
-      remove_first_occurence_of_character("\"", tempcom);
-      if (strchr(tempcom, '\"') != strrchr(tempcom, '\"'))
-        saymsg(MB_OK, HWND_DESKTOP,
-               NullStr,
-               GetPString(IDS_QUOTESINARGSTEXT),
-               pszPgm);
-      else
-        remove_first_occurence_of_character("\"", tempcom);
+      while (strchr(tempcom, '\"'))
+           remove_first_occurence_of_character("\"", tempcom);
       if ((temparg[0] == '\"' && temparg[1] == ' ') ||
            !strstr(pszPgm, "\\:")||
@@ -1371 +1360 @@
                GetPString(IDS_QUOTESINARGSTEXT),
                pszPgm);
-      if (!strstr(strlwr(tempcom), ".exe")) {
+      if (!offsetexe) {
         ret = DosFindFirst(tempcom, &hdirFindHandle, FILE_NORMAL, &FindBuffer,
                            ulResultBufLen, &ulFindCount, FIL_STANDARD);
-        BldQuotedFileName(szTempPgm, tempcom);
-      }
-      else{
-        BldQuotedFileName(szTempPgm, tempcom);
+        if (ret){
+          pszChar = tempcom;
+          while (pszChar){
+            if (*pszChar == ' '){
+              *pszChar = '\0';
+              strcat(tempcom, ".exe");
+              ret = DosQueryAppType(tempcom, &ulAppType);
+              //printf("%d %s\n", ret, tempcom); fflush(stdout);
+              if (!ret){
+                strcpy(temparg, pszPgm + strlen(tempcom) - 3);
+                break;
+              }
+            }
+            strcpy(tempcom, pszPgm);
+            pszChar++;
+          }
+        }
+      }
+      else
         ret = DosQueryAppType(tempcom, &ulAppType);
-      }
+      BldQuotedFileName(szTempPgm, tempcom);
       //printf("%d A", ret); fflush(stdout);
       if (ret) {
@@ -1388 +1392 @@
                      pszPgm);
         if (ret == MBID_YES){
-          if (temparg[0] != ' ')
-            strcat(szTempPgm, " ");
-          strcat(szTempPgm, temparg);
-          pszQuotedCompletePgm = szTempPgm;
+          pszQuotedCompletePgm = pszPgm;
         }
         else{
@@ -1491 +1492 @@
                    pszPgm);
       if (ret == MBID_YES){
-        if (temparg[0] != ' ')
-          strcat(szTempPgm, " ");
-        strcat(szTempPgm, temparg);
-        pszQuotedCompletePgm = szTempPgm;
+        pszQuotedCompletePgm = pszPgm;
       }
       else{
@@ -1501 +1499 @@
       }
     }
-    ret = saymsg(MB_YESNO,
+    ret = saymsg(MB_YESNOCANCEL,
                    HWND_DESKTOP,
                    NullStr,
                    GetPString(IDS_PROGRAMNOTEXE3TEXT),
-                   pszPgm);
+                   pszPgm, szTempPgm);
       if (ret == MBID_YES){
         if (temparg[0] != ' ')
@@ -1512 +1510 @@
         pszQuotedCompletePgm = szTempPgm;
       }
-      else{
+      if (ret == MBID_CANCEL){
         fCancelAction = TRUE;
         pszQuotedCompletePgm = pszPgm;
       }
+      else
+        pszQuotedCompletePgm = pszPgm;
     }
     return pszQuotedCompletePgm;