Changeset 1082 for trunk/dll/cmdline.c

Timestamp:

Jul 20, 2008, 12:37:36 AM (17 years ago)

Author:

Gregg Young

Message:

Changes so FM2 will use TMP/TEMP directory for all temp files; Replaced save_dir2 with global variable so BldFullPathName could easily replace code that performed the same function; Added #ifdef FORTIFY to free_ function that are only used when fortified.

File:

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

trunk/dll/cmdline.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2004, 2007 Steven H.Levine
+  Copyright (c) 2004, 2008 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -18 +18 @@
   29 Feb 08 GKY Use xfree where appropriate
   20 Apr 08 GKY New variable names; Save and Load command lines of user set length
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
 
 ***********************************************************************/
@@ -74 +75 @@
     else
       MiniLoaded = TRUE;
-    save_dir2(pszCmdLine);
+    BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+    /*save_dir2(pszCmdLine);
     if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')
       strcat(pszCmdLine, "\\");
-    strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+    strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");*/
     fp = _fsopen(pszCmdLine, "r", SH_DENYWR);
     if (fp) {
@@ -130 +132 @@
   if (!pszCmdLine)
     return;
-  save_dir2(pszCmdLine);
+  BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+  /*save_dir2(pszCmdLine);
   if (pszCmdLine[strlen(pszCmdLine) - 1] != '\\')
     strcat(pszCmdLine, "\\");
-  strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
+  strcat(pszCmdLine, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");*/
   if (CmdLineHead) {
     fp = xfopen(pszCmdLine, "w", pszSrcFile, __LINE__);