Changeset 985 for trunk/dll/pathutil.c

Timestamp:

Mar 1, 2008, 2:37:14 AM (17 years ago)

Author:

Gregg Young

Message:

Update sizes dialog (ticket 44); Make max command line length user settable (ticket 199); use xfree for free in most cases (ticket 212); initial code to check for valid ini file (ticket 102); Some additional refactoring and structure rework; Some documentation updates;

File:

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

trunk/dll/pathutil.c

@@ -11 +11 @@
   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
+  29 Feb 08 GKY Use xfree where appropriate
+  29 Feb 08 GKY Changes to enable user settable command line length
 
 ***********************************************************************/
@@ -25 +27 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+
+static PSZ pszSrcFile = __FILE__;
 
 // #pragma data_seg(DATA1)
@@ -105 +109 @@
  * 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
+ * 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.
@@ -112 +116 @@
 PCSZ NormalizeCmdLine(PSZ pszWorkBuf, PSZ pszCmdLine_)
 {
-  char szCmdLine[MAXCOMLINESTRG], szArgs[MAXCOMLINESTRG];
+  char *szCmdLine, *szArgs;
   char *offset = '\0', *offsetexe, *offsetcom, *offsetcmd, *offsetbtm, *offsetbat;
   APIRET ret;
@@ -123 +127 @@
   PSZ pszNewCmdLine = pszWorkBuf;
 
+  szCmdLine = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!szCmdLine)
+    return pszCmdLine_; //already complained
+  szArgs = xmalloc(MaxComLineStrg, pszSrcFile, __LINE__);
+  if (!szArgs) {
+    xfree(szCmdLine);
+    return pszCmdLine_; //already complained
+  }
   bstrip(pszCmdLine_);
-  memset(pszWorkBuf, 0, MAXCOMLINESTRG);
+  memset(pszWorkBuf, 0, MaxComLineStrg);
   strcpy(szCmdLine, pszCmdLine_);
   if (szCmdLine[0] != '\0') {
@@ -317 +329 @@
     }
   }
+  xfree(szArgs);
+  xfree(szCmdLine);
   return pszWorkBuf;
 }