Changeset 920 for trunk/dll

Timestamp:

Jan 13, 2008, 2:18:17 AM (18 years ago)

Author:

Gregg Young

Message:

Cleanup of NormalizeCmdLine moved to pathutil.c

Location:

trunk/dll

Files:

• assoc.c (modified) (6 diffs)
• avv.c (modified) (3 diffs)
• command.c (modified) (5 diffs)
• dirsize.c (modified) (3 diffs)
• fm3dll.h (modified) (1 diff)
• fm3dll.str (modified) (1 diff)
• fm3str.h (modified) (1 diff)
• newview.c (modified) (1 diff)
• notebook.c (modified) (10 diffs)
• pathutil.c (modified) (3 diffs)
• pathutil.h (modified) (1 diff)
• systemf.c (modified) (4 diffs)

trunk/dll/assoc.c

@@ -15 +15 @@
   19 Apr 07 SHL Sync with AcceptOneDrop GetOneDrop mods
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
-  06 Jan 08 GKY Use CheckApp_QuoteAddExe to check program strings on entry
+  06 Jan 08 GKY Use NormalizeCmdLine to check program strings on entry
 
 **************************************************************************************/
@@ -632 +632 @@
         ASSOC temp;
         CHAR dummy[34];
-        PSZ psz;
+        PSZ pszWorkBuf;
         replace = FALSE;
 
@@ -645 +645 @@
                                           MPFROMSHORT(0), MPFROMSHORT(TRUE));
         }
-        psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
         memset(&temp, 0, sizeof(ASSOC));
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
         WinQueryDlgItemText(hwnd, ASS_CL, sizeof(temp.cl), temp.cl);
-        CheckApp_QuoteAddExe(psz, temp.cl);
-        memcpy(temp.cl, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, temp.cl);
+        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
         rstrip(temp.sig);
@@ -730 +730 @@
         ASSOC temp;
         CHAR dummy[34];
-        PSZ psz;
+        PSZ pszWorkBuf;
         replace = FALSE;
 
-        psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
         memset(&temp, 0, sizeof(ASSOC));
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
         WinQueryDlgItemText(hwnd, ASS_CL, sizeof(temp.cl), temp.cl);
-        CheckApp_QuoteAddExe(psz, temp.cl);
-        memcpy(temp.cl, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, temp.cl);
+        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
         rstrip(temp.sig);
@@ -840 +840 @@
         ASSOC temp;
         CHAR dummy[34];
-        PSZ psz;
+        PSZ pszWorkBuf;
         replace = TRUE;
 
@@ -847 +847 @@
                                       LM_QUERYSELECTION,
                                       MPFROMSHORT(LIT_CURSOR), MPVOID);
-        psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
         memset(&temp, 0, sizeof(ASSOC));
         WinQueryDlgItemText(hwnd, ASS_MASK, sizeof(temp.mask), temp.mask);
         WinQueryDlgItemText(hwnd, ASS_CL, sizeof(temp.cl), temp.cl);
-        CheckApp_QuoteAddExe(psz, temp.cl);
-        memcpy(temp.cl, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, temp.cl);
+        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
         WinQueryDlgItemText(hwnd, ASS_SIG, sizeof(temp.sig), temp.sig);
         rstrip(temp.sig);

trunk/dll/avv.c

@@ -23 +23 @@
   16 Jun 07 SHL Update for OpenWatcom
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
-  06 Jan 08 GKY Use CheckApp_QuoteAddExe to check program strings on entry
+  06 Jan 08 GKY Use NormalizeCmdLine to check program strings on entry
 
 ***********************************************************************/
@@ -40 +40 @@
 #include "errutil.h"                    // Runtime_Error
 #include "fm3dll.h"
+#include "pathutil.h"                   // NormalizeCmdLine
 
 #pragma data_seg(DATA1)
@@ -92 +93 @@
 static PSZ free_and_strdup_quoted_from_window(HWND hwnd, USHORT id, PSZ pszDest)
 { // fixme for command line limit
-  CHAR sz[256];
-  PSZ psz;
-
-  psz = xmalloc(256, pszSrcFile, __LINE__);
+  CHAR szCmdLine[256];
+  PSZ pszWorkBuf;
+
+  pszWorkBuf = xmalloc(256, pszSrcFile, __LINE__);
   xfree(pszDest);
-  WinQueryDlgItemText(hwnd, id, sizeof(sz), sz);
-  if (*sz){
-    CheckApp_QuoteAddExe(psz, sz);
-    pszDest = xstrdup(psz, pszSrcFile, __LINE__);
+  WinQueryDlgItemText(hwnd, id, sizeof(szCmdLine), szCmdLine);
+  if (*szCmdLine){
+    NormalizeCmdLine(pszWorkBuf, szCmdLine);
+    pszDest = xstrdup(pszWorkBuf, pszSrcFile, __LINE__);
   }
   else

trunk/dll/command.c

@@ -21 +21 @@
   19 Apr 07 SHL Sync with AcceptOneDrop GetOneDrop mods
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
-  06 Jan 08 GKY Use CheckApp_QuoteAddExe to check program strings on entry
+  06 Jan 08 GKY Use NormalizeCmdLine to check program strings on entry
 
 ***********************************************************************/
@@ -40 +40 @@
 #include "strutil.h"                    // GetPString
 #include "fm3dll.h"
-
+#include "pathutil.h"                   // NormalizeCmdLine
 
 typedef struct
@@ -621 +621 @@
       {
         COMMAND temp;
-        PSZ psz;
+        PSZ pszWorkBuf;
         APIRET ret;
 
-        psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
         memset(&temp, 0, sizeof(COMMAND));
         WinQueryDlgItemText(hwnd, CMD_CL, sizeof(temp.cl), temp.cl);
-        CheckApp_QuoteAddExe(psz, temp.cl);
-        memcpy(temp.cl, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, temp.cl);
+        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
         if (!strchr(temp.cl, '%')){
           ret = saymsg(MB_YESNO,
@@ -716 +716 @@
       {
         COMMAND temp;
-        PSZ psz;
+        PSZ pszWorkBuf;
         APIRET ret;
 
-        psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
         memset(&temp, 0, sizeof(COMMAND));
         WinQueryDlgItemText(hwnd, CMD_CL, sizeof(temp.cl), temp.cl);
-        CheckApp_QuoteAddExe(psz, temp.cl);
-        memcpy(temp.cl, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, temp.cl);
+        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
         if (!strchr(temp.cl, '%')){
           ret = saymsg(MB_YESNO,
@@ -816 +816 @@
     case CMD_REPLACE:
       { //Delete first
-        PSZ psz;
+        PSZ pszWorkBuf;
         COMMAND temp;
         APIRET ret;
 
-        psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+        pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
         memset(&temp, 0, sizeof(COMMAND));
         WinQueryDlgItemText(hwnd, CMD_CL, sizeof(temp.cl), temp.cl);
-        CheckApp_QuoteAddExe(psz, temp.cl);
-        memcpy(temp.cl, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, temp.cl);
+        memcpy(temp.cl, pszWorkBuf, strlen(pszWorkBuf) + 1);
         if (fCancelAction){
           fCancelAction = FALSE;

trunk/dll/dirsize.c

@@ -92 +92 @@
   CHAR maskstr[CCHMAXPATH];
   CHAR szBuf[CCHMAXPATH];
+  CHAR FileSystem[CCHMAXPATH];
   CHAR *pEndMask;
   register char *p;
@@ -109 +110 @@
   *pullTotalBytes = 0;                  // In case we fail
 
+  CheckDrive(toupper(*pszFileName), FileSystem, NULL);
+  /*if (!stricmp(FileSystem, NTFS)) {
+    saymsg(MB_OK,
+           HWND_DESKTOP,
+           NullStr,
+           GetPString(IDS_NTFSDRIVERFAILSTEXT));
+    return FALSE;
+  } */
   ulBufBytes = sizeof(FILEFINDBUF4L) * FilesToGet;
   pffbArray = xmalloc(ulBufBytes, pszSrcFile, __LINE__);
@@ -138 +147 @@
    * requesting EASIZE.  sheesh.
    */
-  if ((!rc && (pffbArray->attrFile & FILE_DIRECTORY)) || strlen(pszFileName) < 4) {
+  if (((!rc || rc == ERROR_NO_MORE_FILES) && (pffbArray->attrFile & FILE_DIRECTORY)) || strlen(pszFileName) < 4) {
     if (*pchStopFlag) {
       free(pffbArray);

trunk/dll/fm3dll.h

@@ -684 +684 @@
 HAPP Exec(HWND hwndNotify, BOOL child, char *startdir, char *env,
           PROGTYPE * progt, ULONG fl, char *formatstring, ...);
-PSZ CheckApp_QuoteAddExe(PSZ pszQuotedCompletePgm, PSZ pszPgm);
 #define MAXCOMLINESTRG (4096)                   /* used to build command line strings */
 #define RUNTYPE_MASK  0xf

trunk/dll/fm3dll.str

@@ -723 +723 @@
 Unknown datatype 0x%04x (%u bytes)
 FM/2 Databar
-Spare 724
+The NTFS.IFS fails with a NO_MORE_FILES_ERROR on each subdirectory. We have not found a work around as yet.
 Sun
 Mon

trunk/dll/fm3str.h

@@ -717 +717 @@
 #define IDS_UNKNOWNBYTESTEXT                                  722
 #define IDS_DATABARTITLETEXT                                  723
-#define IDS_SPARE_724                                         724       // available
+#define IDS_NTFSDRIVERFAILSTEXT                               724
 #define IDS_SUNDAY                                            725
 #define IDS_MONDAY                                            726

trunk/dll/newview.c

@@ -1962 +1962 @@
 
   case UM_SETUP2:
-    /*
+    /**
      * calculate width of client in characters, recalc lines if
      * oldwidth != newwidth, set ad->oldwidth for later comparison

trunk/dll/notebook.c

@@ -21 +21 @@
   21 Aug 07 GKY Make Subject column in dircnr sizable and movable from the rigth to the left pane
   26 Nov 07 GKY Allow a currently nonvalid path in the ext path field with warning
-  06 Jan 08 GKY Use CheckApp_QuoteAddExe to check program strings on entry
+  06 Jan 08 GKY Use NormalizeCmdLine to check program strings on entry
   10 Jan 08 SHL Remember last settings page
   10 Jan 08 SHL Rework page select logic
@@ -194 +194 @@
     {
       CHAR szCLBuf[MAXCOMLINESTRG], szPathBuf[CCHMAXPATH];
-      PSZ psz;
-
-      psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      PSZ pszWorkBuf;
+
+      pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
       WinQueryDlgItemText(hwnd, CFGA_VIRUS, MAXCOMLINESTRG, szCLBuf);
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
       if (strcmp(szCLBuf, virus)){
-        CheckApp_QuoteAddExe(psz, szCLBuf);
-        memcpy(virus, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(virus, pszWorkBuf, strlen(pszWorkBuf) + 1);
         if (!strchr(virus, '%') && strlen(virus) > 3)
           strcat(virus, " %p");
@@ -458 +458 @@
     {
       CHAR szCLBuf[MAXCOMLINESTRG];
-      PSZ psz;
-
-      psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      PSZ pszWorkBuf;
+
+      pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
       WinQueryDlgItemText(hwnd, CFGV_VIEWER, MAXCOMLINESTRG, szCLBuf);
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
       if (strcmp(szCLBuf, viewer)){
-        CheckApp_QuoteAddExe(psz, szCLBuf);
-        memcpy(viewer, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(viewer, pszWorkBuf, strlen(pszWorkBuf) + 1);
         if (!strchr(viewer, '%') && strlen(viewer) > 3)
           strcat(viewer, " %a");
@@ -472 +472 @@
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
       if (strcmp(szCLBuf, editor)){
-        CheckApp_QuoteAddExe(psz, szCLBuf);
-        memcpy(editor, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(editor, pszWorkBuf, strlen(pszWorkBuf) + 1);
         if (!strchr(editor, '%') && strlen(editor) > 3)
           strcat(editor, " %a");
@@ -480 +480 @@
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
       if (strcmp(szCLBuf, binview)){
-        CheckApp_QuoteAddExe(psz, szCLBuf);
-        memcpy(binview, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(binview, pszWorkBuf, strlen(pszWorkBuf) + 1);
         if (!strchr(binview, '%') && strlen(binview) > 3)
           strcat(binview, " %a");
@@ -488 +488 @@
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
       if (strcmp(szCLBuf, bined)){
-        CheckApp_QuoteAddExe(psz, szCLBuf);
-        memcpy(bined, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(bined, pszWorkBuf, strlen(pszWorkBuf) + 1);
         if (!strchr(bined, '%') && strlen(bined) > 3)
           strcat(bined, " %a");
@@ -652 +652 @@
       // they contain args.
       CHAR szCLBuf[MAXCOMLINESTRG], szPathBuf[CCHMAXPATH];
-      PSZ  psz;
-
-      psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      PSZ  pszWorkBuf;
+
+      pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
       WinQueryDlgItemText(hwnd, CFGH_RUNHTTPWORKDIR, CCHMAXPATH, szPathBuf);
       szPathBuf[CCHMAXPATH - 1] = 0;
@@ -670 +670 @@
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
       if (strcmp(szCLBuf, ftprun)){
-        CheckApp_QuoteAddExe(psz, szCLBuf);
-        memcpy(ftprun, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(ftprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
       WinQueryDlgItemText(hwnd, CFGH_HTTPRUN, MAXCOMLINESTRG, szCLBuf);
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
       if (strcmp(szCLBuf, httprun)){
-        CheckApp_QuoteAddExe(psz, szCLBuf);
-        memcpy(httprun, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(httprun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
       WinQueryDlgItemText(hwnd, CFGH_MAILRUN, MAXCOMLINESTRG, szCLBuf);
       szCLBuf[MAXCOMLINESTRG - 1] = 0;
       if (strcmp(szCLBuf, mailrun)){
-        CheckApp_QuoteAddExe(psz, szCLBuf);
-        memcpy(mailrun, psz, strlen(psz) + 1);
+        NormalizeCmdLine(pszWorkBuf, szCLBuf);
+        memcpy(mailrun, pszWorkBuf, strlen(pszWorkBuf) + 1);
       }
       PrfWriteProfileString(fmprof, appname, "HttpRunDir", httprundir);
@@ -1263 +1263 @@
     {
       CHAR szCLBuf[MAXCOMLINESTRG];
-      PSZ psz;
-
-      psz = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
+      PSZ pszWorkBuf;
+
+      pszWorkBuf = xmalloc(MAXCOMLINESTRG, pszSrcFile, __LINE__);
       WinQueryDlgItemText(hwnd, CFGC_DIRCOMPARE, MAXCOMLINESTRG, szCLBuf);
         szCLBuf[MAXCOMLINESTRG - 1] = 0;
         if (strcmp(szCLBuf, dircompare)){
-          CheckApp_QuoteAddExe(psz, szCLBuf);
-          memcpy(dircompare, psz, strlen(psz) + 1);
+          NormalizeCmdLine(pszWorkBuf, szCLBuf);
+          memcpy(dircompare, pszWorkBuf, strlen(pszWorkBuf) + 1);
           if (!strchr(dircompare, '%') && strlen(dircompare) > 3)
             strcat(dircompare, " %a");
@@ -1278 +1278 @@
         szCLBuf[MAXCOMLINESTRG - 1] = 0;
         if (strcmp(szCLBuf, compare)){
-          CheckApp_QuoteAddExe(psz, szCLBuf);
-          memcpy(compare, psz, strlen(psz) + 1);
+          NormalizeCmdLine(pszWorkBuf, szCLBuf);
+          memcpy(compare, pszWorkBuf, strlen(pszWorkBuf) + 1);
           if (!strchr(compare, '%') && strlen(compare) > 3)
             strcat(compare, " %a");

trunk/dll/pathutil.c

@@ -10 +10 @@
 
   05 Jan 08 SHL Move from arccnrs.c and comp.c to here
+  06 Jan 08 GKY Add NormalizeCmdLine to check program strings on entry
 
 ***********************************************************************/
@@ -16 +17 @@
 
 #define INCL_WIN
+#define INCL_DOS
 #define INCL_LONGLONG
 
 #include "pathutil.h"
 #include "fm3dll.h"                     // needs_quoting
+#include "fm3str.h"
+#include "errutil.h"                    // Dos_Error...
+#include "strutil.h"                    // GetPString
 
 // #pragma data_seg(DATA1)
@@ -96 +101 @@
 }
 
+/** NormalizeCmdLine
+ * Checks a command line for common errors (missing quotes, missing extension,
+ * no space between exe and args etc)
+ * Command line passed as pszCmdLine_
+ * A pointer to a buffer of the size MAXCOMLINESTRG should be supplied in
+ * pszWorkBuf. This is where the quoted etc as necessary command
+ * line string will be returned.
+ */
+
+PCSZ NormalizeCmdLine(PSZ pszWorkBuf, PSZ pszCmdLine_)
+{
+  char szCmdLine[MAXCOMLINESTRG], szArgs[MAXCOMLINESTRG];
+  char *offset = '\0', *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
+  APIRET ret;
+  ULONG ulAppType;
+  char *pszChar;
+  FILEFINDBUF3 FindBuffer;
+  ULONG ulResultBufLen = sizeof(FILEFINDBUF3);
+  HDIR hdirFindHandle = HDIR_CREATE;
+  ULONG ulFindCount = 1;
+  PSZ pszNewCmdLine = pszWorkBuf;
+
+  bstrip(pszCmdLine_);
+  strcpy(szCmdLine, pszCmdLine_);
+  if (szCmdLine[0] != '\0') {
+    offsetexe = strstr(strlwr(pszCmdLine_), ".exe");
+    offsetcmd = strstr(strlwr(pszCmdLine_), ".cmd");
+    offsetcom = strstr(strlwr(pszCmdLine_), ".com");
+    offsetbtm = strstr(strlwr(pszCmdLine_), ".btm");
+    offsetbat = strstr(strlwr(pszCmdLine_), ".bat");
+    if (offsetexe)
+      offset = offsetexe;
+    else {
+      if (offsetcom)
+        offset = offsetcom;
+      else {
+        if (offsetcmd)
+          offset = offsetcmd;
+        else {
+          if (offsetbtm)
+            offset = offsetbtm;
+          else {
+            if (offsetbat)
+              offset = offsetexe;
+          }
+        }
+      }
+    }
+    if (offset) {
+      szCmdLine[offset + 4 - pszCmdLine_] = '\0';
+      strcpy(szArgs, &pszCmdLine_[offset + 4 - pszCmdLine_]);
+      while (strchr(szCmdLine, '\"'))
+           remove_first_occurence_of_character("\"", szCmdLine);
+      if ((szArgs[0] == '\"' && szArgs[1] == ' ') ||
+           !strstr(pszCmdLine_, "\\:")||
+           strchr(szArgs, '\"') == strrchr(szArgs, '\"'))
+        remove_first_occurence_of_character("\"", szArgs);
+      if (strchr(szArgs, '\"') != strrchr(szArgs, '\"'))
+        saymsg(MB_OK, HWND_DESKTOP,
+               NullStr,
+               GetPString(IDS_QUOTESINARGSTEXT),
+               pszCmdLine_);
+      if (!offsetexe) {
+        ret = DosFindFirst(szCmdLine, &hdirFindHandle, FILE_NORMAL, &FindBuffer,
+                           ulResultBufLen, &ulFindCount, FIL_STANDARD);
+        if (ret) {
+          pszChar = szCmdLine;
+          while (pszChar) {
+            if (*pszChar == ' ') {
+              *pszChar = '\0';
+              strcat(szCmdLine, ".exe");
+              ret = DosQueryAppType(szCmdLine, &ulAppType);
+              //printf("%d %s\n", ret, szCmdLine); fflush(stdout);
+              if (!ret) {
+                strcpy(szArgs, pszCmdLine_ + strlen(szCmdLine) - 3);
+                break;
+              }
+            }
+            strcpy(szCmdLine, pszCmdLine_);
+            pszChar++;
+          }
+        }
+      }
+      else
+        ret = DosQueryAppType(szCmdLine, &ulAppType);
+      BldQuotedFileName(pszNewCmdLine, szCmdLine);
+      //printf("%d A", ret); fflush(stdout);
+      if (ret) {
+        ret = saymsg(MB_YESNO,
+                     HWND_DESKTOP,
+                     NullStr,
+                     GetPString(IDS_PROGRAMNOTFOUNDTEXT),
+                     pszCmdLine_);
+        if (ret == MBID_YES){
+          pszNewCmdLine = pszCmdLine_;
+      }
+        else{
+          fCancelAction = TRUE;
+          pszNewCmdLine = pszCmdLine_;
+        }
+      }
+      else{
+        if (szArgs[0] != ' ')
+          strcat(pszNewCmdLine, " ");
+        strcat(pszNewCmdLine, szArgs);
+      }
+
+    }
+    else if (szCmdLine && (!strchr(szCmdLine, '.') ||
+                         strrchr(szCmdLine, '.' ) < strrchr(szCmdLine, '\\'))) {
+      if (!strchr(szCmdLine, ' ')) {
+        while (strchr(szCmdLine, '\"'))
+          remove_first_occurence_of_character("\"", szCmdLine);
+        strcat(szCmdLine, ".exe");
+        ret = DosFindFirst(szCmdLine, &hdirFindHandle, FILE_NORMAL, &FindBuffer,
+                           ulResultBufLen, &ulFindCount, FIL_STANDARD);
+        //printf("%d", ret); fflush(stdout);
+      }
+      else {
+        pszChar = szCmdLine;
+        while (pszChar) {
+          while (strchr(szCmdLine, '\"'))
+            remove_first_occurence_of_character("\"", szCmdLine);
+          if (*pszChar == ' ') {
+            *pszChar = '\0';
+            strcat(szCmdLine, ".exe");
+            ret = DosQueryAppType(szCmdLine, &ulAppType);
+            //printf("%d %s\n", ret, szCmdLine); fflush(stdout);
+            if (!ret) {
+              break;
+            }
+          }
+          strcpy(szCmdLine, pszCmdLine_);
+          pszChar++;
+        }
+      }
+      if (!ret){
+        BldQuotedFileName(pszNewCmdLine, szCmdLine);
+        strcpy(szArgs, pszCmdLine_ + strlen(szCmdLine) - 3);
+        if ((szArgs[0] == '\"' && szArgs[1] == ' ') ||
+             !strstr(pszCmdLine_, "\\:" ) ||
+             strchr(szArgs, '\"') == strrchr(szArgs, '\"'))
+          remove_first_occurence_of_character("\"", szArgs);
+        if (strchr(szArgs, '\"') != strrchr(szArgs, '\"'))
+          saymsg(MB_OK, HWND_DESKTOP,
+                 NullStr,
+                 GetPString(IDS_QUOTESINARGSTEXT),
+                 pszCmdLine_);
+        if (szArgs[0] != ' ')
+          strcat(pszNewCmdLine, " ");
+        strcat(pszNewCmdLine, szArgs);
+      }
+      else {
+        ret = saymsg(MB_OK,
+                     HWND_DESKTOP,
+                     NullStr,
+                     GetPString(IDS_PROGRAMNOTEXE2TEXT),
+                     pszCmdLine_);
+          fCancelAction = TRUE;
+          pszNewCmdLine = pszCmdLine_;
+      }
+    }
+    else {
+      pszChar = strrchr(szCmdLine, '.');
+      while (pszChar && *pszChar !=' ') {
+        pszChar++;
+      }
+      *pszChar = '\0';
+      strcpy (szArgs, pszCmdLine_ + strlen(szCmdLine));
+      while (strchr(szCmdLine, '\"'))
+        remove_first_occurence_of_character("\"", szCmdLine);
+    if ((szArgs[0] == '\"' && szArgs[1] == ' ') ||
+         !strstr(pszCmdLine_, "\\:")||
+         strchr(szArgs, '\"') == strrchr(szArgs, '\"'))
+      remove_first_occurence_of_character("\"", szArgs);
+    if (strchr(szArgs, '\"') != strrchr(szArgs, '\"'))
+      saymsg(MB_OK, HWND_DESKTOP,
+             NullStr,
+             GetPString(IDS_QUOTESINARGSTEXT),
+             pszCmdLine_);
+    ret = DosFindFirst(szCmdLine, &hdirFindHandle, FILE_NORMAL, &FindBuffer,
+                         ulResultBufLen, &ulFindCount, FIL_STANDARD);
+
+    BldQuotedFileName(pszNewCmdLine, szCmdLine);
+    //printf("%d %s ", ret, szCmdLine); fflush(stdout);
+    if (ret) {
+      ret = saymsg(MB_YESNO,
+                   HWND_DESKTOP,
+                   NullStr,
+                   GetPString(IDS_PROGRAMNOTFOUNDTEXT),
+                   pszCmdLine_);
+      if (ret == MBID_YES) {
+        pszWorkBuf = pszCmdLine_;
+      }
+      else {
+        fCancelAction = TRUE;
+        pszWorkBuf = pszCmdLine_;
+      }
+    }
+    ret = saymsg(MB_YESNOCANCEL,
+                   HWND_DESKTOP,
+                   NullStr,
+                   GetPString(IDS_PROGRAMNOTEXE3TEXT),
+                   pszCmdLine_, pszNewCmdLine);
+      if (ret == MBID_YES){
+        if (szArgs[0] != ' ')
+          strcat(pszNewCmdLine, " ");
+        strcat(pszNewCmdLine, szArgs);
+      }
+      if (ret == MBID_CANCEL){
+        fCancelAction = TRUE;
+        pszNewCmdLine = pszCmdLine_;
+      }
+    }
+  }
+  return pszWorkBuf;
+}
+
 #pragma alloc_text(PATHUTIL,BldFullPathName)
 #pragma alloc_text(PATHUTIL,BldQuotedFileName)
 #pragma alloc_text(PATHUTIL,BldQuotedFullPathName)
+#pragma alloc_text(PATHUTIL,NormalizeCmdLine)

trunk/dll/pathutil.h

@@ -25 +25 @@
 PSZ BldQuotedFullPathName(PSZ pszFullPathName, PSZ pszPathName, PSZ pszFileName);
 PSZ BldQuotedFileName(PSZ pszQuotedFileName, PSZ pszFileName);
+PCSZ NormalizeCmdLine(PSZ pszWorkBuf, PSZ pszCmdLine_);
 
 #endif // PATHUTIL_H

trunk/dll/systemf.c

@@ -20 +20 @@
   06 Aug 07 GKY Reduce DosSleep times (ticket 148)
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
-  06 Jan 08 GKY Add CheckApp_QuoteAddExe to check program strings on entry
 
 ***********************************************************************/
@@ -611 +610 @@
             char *formatstring,...)
 {
-  /* example:
+  /** example:
 
    * status = runemf2(SEPARATE | WINDOWED,
@@ -625 +624 @@
    */
 
-  /*
+  /**
    * type bitmapped flag -- see FM3DLL.H
    */
@@ -1316 +1315 @@
 }
 
-PSZ CheckApp_QuoteAddExe(PSZ pszQuotedCompletePgm, PSZ pszPgm)
-{
-  char tempcom[MAXCOMLINESTRG], temparg[MAXCOMLINESTRG];
-  char *offset = '\0', *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
-  APIRET ret;
-  ULONG ulAppType;
-  char *pszChar;
-  FILEFINDBUF3 FindBuffer;
-  ULONG ulResultBufLen = sizeof(FILEFINDBUF3);
-  HDIR hdirFindHandle = HDIR_CREATE;
-  ULONG ulFindCount = 1;
-  PSZ pszTempPgm = pszQuotedCompletePgm;
-
-  bstrip(pszPgm);
-  strcpy(tempcom, pszPgm);
-  if (tempcom[0] != '\0') {
-    offsetexe = strstr(strlwr(pszPgm), ".exe");
-    offsetcmd = strstr(strlwr(pszPgm), ".cmd");
-    offsetcom = strstr(strlwr(pszPgm), ".com");
-    offsetbtm = strstr(strlwr(pszPgm), ".btm");
-    offsetbat = strstr(strlwr(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 = offsetexe;
-          }
-        }
-      }
-    }
-    if (offset) {
-      tempcom[offset + 4 - pszPgm] = '\0';
-      strcpy(temparg, &pszPgm[offset + 4 - pszPgm]);
-      while (strchr(tempcom, '\"'))
-           remove_first_occurence_of_character("\"", tempcom);
-      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 (!offsetexe) {
-        ret = DosFindFirst(tempcom, &hdirFindHandle, FILE_NORMAL, &FindBuffer,
-                           ulResultBufLen, &ulFindCount, FIL_STANDARD);
-        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(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){
-          pszTempPgm = pszPgm;
-      }
-        else{
-          fCancelAction = TRUE;
-          pszTempPgm = pszPgm;
-        }
-      }
-      else{
-        if (temparg[0] != ' ')
-          strcat(pszTempPgm, " ");
-        strcat(pszTempPgm, temparg);
-      }
-
-    }
-    else if (tempcom && (!strchr(tempcom, '.') ||
-                         strrchr(tempcom, '.' ) < strrchr(tempcom, '\\'))) {
-      if (!strchr(tempcom, ' ')) {
-        while (strchr(tempcom, '\"'))
-          remove_first_occurence_of_character("\"", tempcom);
-        strcat(tempcom, ".exe");
-        ret = DosFindFirst(tempcom, &hdirFindHandle, FILE_NORMAL, &FindBuffer,
-                           ulResultBufLen, &ulFindCount, FIL_STANDARD);
-        //printf("%d", ret); fflush(stdout);
-      }
-      else {
-        pszChar = tempcom;
-        while (pszChar) {
-          while (strchr(tempcom, '\"'))
-            remove_first_occurence_of_character("\"", tempcom);
-          if (*pszChar == ' ') {
-            *pszChar = '\0';
-            strcat(tempcom, ".exe");
-            ret = DosQueryAppType(tempcom, &ulAppType);
-            //printf("%d %s\n", ret, tempcom); fflush(stdout);
-            if (!ret) {
-              break;
-            }
-          }
-          strcpy(tempcom, pszPgm);
-          pszChar++;
-        }
-      }
-      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;
-          pszTempPgm = pszPgm;
-      }
-    }
-    else {
-      pszChar = strrchr(tempcom, '.');
-      while (pszChar && *pszChar !=' ') {
-        pszChar++;
-      }
-      *pszChar = '\0';
-      strcpy (temparg, pszPgm + strlen(tempcom));
-      while (strchr(tempcom, '\"'))
-        remove_first_occurence_of_character("\"", tempcom);
-    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);
-    ret = DosFindFirst(tempcom, &hdirFindHandle, FILE_NORMAL, &FindBuffer,
-                         ulResultBufLen, &ulFindCount, FIL_STANDARD);
-
-    BldQuotedFileName(pszTempPgm, tempcom);
-    //printf("%d %s ", ret, tempcom); 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;
-      }
-    }
-    ret = saymsg(MB_YESNOCANCEL,
-                   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;
-      }
-    }
-  }
-  else
-    pszTempPgm = pszPgm;
-  return pszQuotedCompletePgm;
-}
-
-#pragma alloc_text(SYSTEMF,ShowSession,ExecOnList,runemf2,CheckApp_QuoteAddExe)
+#pragma alloc_text(SYSTEMF,ShowSession,ExecOnList,runemf2)