Changeset 1247 for trunk/dll/command.c

Timestamp:

Oct 15, 2008, 3:44:29 PM (17 years ago)

Author:

Gregg Young

Message:

Fix issues with NormalizeCmdLine; it now uses searchapath to check for nonexe files in the path, it tries all 5 defined executible extensions when no exetension is provided, it closes dosfind, eliminates extra error message on failure to find extensionless file in commands, improved error message for extensionless file.

File:

• trunk/dll/command.c (modified) (4 diffs)

trunk/dll/command.c

@@ -27 +27 @@
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
   24 Aug 08 GKY Warn full drive on save of .DAT file; prevent loss of existing file
+  15 Oct 08 GKY Prevent asking to add %a on NormalizeCmdLine abort
 
 ***********************************************************************/
@@ -670 +671 @@
         memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
         free(pszWorkBuf);
-        if (!strchr(temp.pszCmdLine, '%')){
+        if (!strchr(temp.pszCmdLine, '%') && !fCancelAction){
           ret = saymsg(MB_YESNO,
                        HWND_DESKTOP,
@@ -775 +776 @@
         memcpy(temp.pszCmdLine, pszWorkBuf, strlen(pszWorkBuf) + 1);
         free(pszWorkBuf);
-        if (!strchr(temp.pszCmdLine, '%')){
+        if (!strchr(temp.pszCmdLine, '%') && !fCancelAction){
           ret = saymsg(MB_YESNO,
                        HWND_DESKTOP,
@@ -893 +894 @@
           break;
         }
-        if (!strchr(temp.pszCmdLine, '%')){
+        if (!strchr(temp.pszCmdLine, '%') && !fCancelAction){
           ret = saymsg(MB_YESNO,
                        HWND_DESKTOP,