Changeset 920 for trunk/dll/command.c

Timestamp:

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

Author:

Gregg Young

Message:

Cleanup of NormalizeCmdLine moved to pathutil.c

File:

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

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;