Changeset 1082 for trunk/dll/remap.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/remap.c (modified) (5 diffs)

trunk/dll/remap.c

@@ -5 +5 @@
 
   Copyright (c) 1993, 1998 M. Kimes
-  Copyright (c) 2004, 2006 Steven H.Levine
+  Copyright (c) 2004, 2008 Steven H.Levine
 
   01 Aug 04 SHL Rework lstrip/rstrip usage
@@ -14 +14 @@
   20 Aug 07 GKY Move #pragma alloc_text to end for OpenWatcom compat
   29 Feb 08 GKY Use xfree where appropriate
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
 
 ***********************************************************************/
@@ -30 +31 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldFullPathName
 #include "fm3dll.h"
 #include "fortify.h"
@@ -71 +73 @@
 
   loadedres = TRUE;
-  save_dir2(s);
+  BldFullPathName(s, pFM2SaveDirectory, "RESOURCE.DAT");
+  /*save_dir2(s);
   if (s[strlen(s) - 1] != '\\')
     strcat(s, "\\");
-  strcat(s, "RESOURCE.DAT");
+  strcat(s, "RESOURCE.DAT");*/
   fp = _fsopen(s, "r", SH_DENYWR);
   if (fp) {
@@ -112 +115 @@
   if (!loadedres)
     return;
-  save_dir2(s);
+  BldFullPathName(s, pFM2SaveDirectory, "RESOURCE.DAT");
+  /*save_dir2(s);
   if (s[strlen(s) - 1] != '\\')
     strcat(s, "\\");
-  strcat(s, "RESOURCE.DAT");
+  strcat(s, "RESOURCE.DAT");*/
   if (reshead) {
     fp = xfopen(s, "w", pszSrcFile, __LINE__);