Changeset 1248 for trunk/dll/pathutil.c

Timestamp:

Oct 16, 2008, 12:10:00 AM (17 years ago)

Author:

Gregg Young

Message:

Cleanup of NormalizeCmdLine changes

File:

• trunk/dll/pathutil.c (modified) (9 diffs)

trunk/dll/pathutil.c

@@ -116 +116 @@
 /** NormalizeCmdLine
  * Checks a command line for common errors (missing quotes, missing extension,
- * no space between exe and args etc)
+ * no space between exe and args etc) Also check for the existance of the file
+ * and checks .com and .exe file headers.
  * Command line passed as pszCmdLine_
  * A pointer to a buffer of the size MaxComLineStrg should be supplied in
@@ -131 +132 @@
   char *pszChar;
   char *FullPath;
-  FILEFINDBUF3 FindBuffer;
-  ULONG ulResultBufLen = sizeof(FILEFINDBUF3);
-  HDIR hdirFindHandle = HDIR_CREATE;
-  ULONG ulFindCount = 1;
   PSZ pszNewCmdLine = pszWorkBuf;
 
@@ -187 +184 @@
                pszCmdLine_);
       if (!offsetexe && !offsetcom) {
-        ret = DosFindFirst(szCmdLine, &hdirFindHandle, FILE_NORMAL, &FindBuffer,
-                           ulResultBufLen, &ulFindCount, FIL_STANDARD);
-        if (ret) {
-          FullPath = searchapath("PATH", szCmdLine);
-          if (*FullPath != 0)
-            ret = 0;
-        }
-        DosFindClose(hdirFindHandle);
+        FullPath = searchapath("PATH", szCmdLine);
+        if (*FullPath)
+          ret = 0;
       }
       else
@@ -230 +222 @@
         while (strchr(szCmdLine, '\"'))
           remove_first_occurence_of_character("\"", szCmdLine);
-        ret = DosQueryAppType(szCmdLine, &ulAppType);
+        ret = DosQueryAppType(szCmdLine, &ulAppType); // exe automatically appended
         if (!ret)
           strcat(szCmdLine, ".exe");
@@ -241 +233 @@
             strcat(szCmdLine, ".cmd");
             FullPath = searchapath("PATH", szCmdLine);
-            if (*FullPath != 0)
+            if (*FullPath)
               ret = 0;
             else {
-              offset = strrchr(szCmdLine, '.' );
               *offset = 0;
               strcat(szCmdLine, ".bat");
               FullPath = searchapath("PATH", szCmdLine);
-              if (*FullPath != 0)
+              if (*FullPath)
                 ret = 0;
               else {
-                offset = strrchr(szCmdLine, '.' );
                 *offset = 0;
                 strcat(szCmdLine, ".bmt");
                 FullPath = searchapath("PATH", szCmdLine);
-                if (*FullPath != 0)
+                if (*FullPath)
                   ret = 0;
               }
@@ -283 +273 @@
                 strcat(szCmdLine, ".cmd");
                 FullPath = searchapath("PATH", szCmdLine);
-                if (*FullPath != 0) {
+                if (*FullPath) {
                   ret = 0;
                   break;
                 }
                 else {
-                  offset = strrchr(szCmdLine, '.' );
                   *offset = 0;
                   strcat(szCmdLine, ".bat");
                   FullPath = searchapath("PATH", szCmdLine);
-                  if (*FullPath != 0) {
+                  if (*FullPath) {
                     ret = 0;
                     break;
                   }
                   else {
-                    offset = strrchr(szCmdLine, '.' );
                     *offset = 0;
                     strcat(szCmdLine, ".bmt");
                     FullPath = searchapath("PATH", szCmdLine);
-                    if (*FullPath != 0) {
+                    if (*FullPath) {
                       ret = 0;
                       break;
@@ -333 +321 @@
         strcat(pszNewCmdLine, szArgs);
       }
-      else { // fail if no extension can be found we require one
+      else { // fail if no extension can be found runemf2 requires one
         ret = saymsg(MB_OK,
                      HWND_DESKTOP,
@@ -361 +349 @@
              GetPString(IDS_QUOTESINARGSTEXT),
              pszCmdLine_);
-    ret = DosFindFirst(szCmdLine, &hdirFindHandle, FILE_NORMAL, &FindBuffer,
-                       ulResultBufLen, &ulFindCount, FIL_STANDARD);
-    DosFindClose(hdirFindHandle);
+    FullPath = searchapath("PATH", szCmdLine);
     BldQuotedFileName(pszNewCmdLine, szCmdLine);
     //printf("%d %s ", ret, szCmdLine); fflush(stdout);
-    if (ret) {
+    if (!*FullPath) {
       ret = saymsg(MB_YESNO,
                    HWND_DESKTOP,
@@ -382 +368 @@
       }
     }
-    ret = saymsg(MB_YESNOCANCEL,
+    else {
+      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_;
+        if (ret == MBID_YES){
+          if (szArgs[0] != ' ')
+            strcat(pszNewCmdLine, " ");
+          strcat(pszNewCmdLine, szArgs);
+        }
+        if (ret == MBID_CANCEL){
+          fCancelAction = TRUE;
+          pszNewCmdLine = pszCmdLine_;
+        }
       }
     }