Changeset 1082 for trunk/dll/assoc.c

Timestamp:

07/20/08 00:37:36 (4 months ago)

Author:

gyoung

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.

Files:

• trunk/dll/assoc.c (modified) (3 diffs)

trunk/dll/assoc.c

@@ -18 +18 @@
   29 Feb 08 GKY Changes to enable user settable command line length
   29 Feb 08 GKY Use xfree where appropriate
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
 
 **************************************************************************************/
@@ -142 +143 @@
     free_associations();
   assloaded = TRUE;
-  save_dir2(mask);
+  BldFullPathName(mask, pFM2SaveDirectory, "ASSOC.DAT");
+  /*save_dir2(mask);
   if (mask[strlen(mask) - 1] != '\\')
     strcat(mask, "\\");
-  strcat(mask, "ASSOC.DAT");
+  strcat(mask, "ASSOC.DAT");*/
   fp = _fsopen(mask, "r", SH_DENYWR);
   pszCmdLine = xmallocz(MaxComLineStrg, pszSrcFile, __LINE__);
@@ -267 +269 @@
   }
 #endif
-  save_dir2(s);
+  /*save_dir2(s);
   if (s[strlen(s) - 1] != '\\')
     strcat(s, "\\");
-  strcat(s, "ASSOC.DAT");
+    strcat(s, "ASSOC.DAT");*/
+  BldFullPathName(s, pFM2SaveDirectory, "ASSOC.DAT");
   fp = xfopen(s, "w", pszSrcFile, __LINE__);
   if (fp) {