Changeset 920 for trunk/dll/avv.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/avv.c (modified) (3 diffs)

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