Changeset 1082 for trunk/dll/filter.c

Timestamp:

07/20/08 00:37:36 (5 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/filter.c (modified) (4 diffs)

trunk/dll/filter.c

@@ -15 +15 @@
   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"
@@ -133 +135 @@
 
   loadedmasks = TRUE;
-  save_dir2(s);
+  BldFullPathName(s, pFM2SaveDirectory, "FILTER.DAT");
+  /*save_dir2(s);
   if (s[strlen(s) - 1] != '\\')
     strcat(s, "\\");
-  strcat(s, "FILTERS.DAT");
+  strcat(s, "FILTERS.DAT");*/
   fp = _fsopen(s, "r", SH_DENYWR);
   if (fp) {
@@ -175 +178 @@
     return;
   if (maskhead) {
-    save_dir2(s);
+    BldFullPathName(s, pFM2SaveDirectory, "FILTER.DAT");
+    /*save_dir2(s);
     if (s[strlen(s) - 1] != '\\')
       strcat(s, "\\");
-    strcat(s, "FILTERS.DAT");
+    strcat(s, "FILTERS.DAT");*/
     fp = xfopen(s, "w", pszSrcFile, __LINE__);
     if (fp) {