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

trunk/dll/saveclip.c

@@ -22 +22 @@
   30 Dec 07 GKY Use CommaFmtULL
   16 Feb 08 GKY Changed _fsopen flag so a new list file can be created
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory and use BldFullPathName
 
 ***********************************************************************/
@@ -37 +38 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldFullPathName
 #include "fm3dll.h"
 #include "fortify.h"
@@ -237 +239 @@
         CHAR s[CCHMAXPATH + 14];
 
-        save_dir2(s);
+        BldFullPathName(s, pFM2SaveDirectory, "PATTERNS.DAT");
+        /*save_dir2(s);
         if (s[strlen(s) - 1] != '\\')
           strcat(s, "\\");
-        strcat(s, "PATTERNS.DAT");
+        strcat(s, "PATTERNS.DAT");*/
         fp = _fsopen(s, "r", SH_DENYWR);
         if (fp) {
@@ -267 +270 @@
                                        LM_QUERYITEMCOUNT, MPVOID, MPVOID);
       if (sMax > 0) {
-        save_dir2(szBuffer);
+        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
+        /*save_dir2(szBuffer);
         if (szBuffer[strlen(szBuffer) - 1] != '\\')
           strcat(szBuffer, "\\");
-        strcat(szBuffer, "PATTERNS.DAT");
+        strcat(szBuffer, "PATTERNS.DAT");*/
         fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__);
         if (fp) {
@@ -287 +291 @@
       }
       else if (!sMax) {
-        save_dir2(szBuffer);
+        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
+        /*save_dir2(szBuffer);
         if (szBuffer[strlen(szBuffer) - 1] != '\\')
           strcat(szBuffer, "\\");
-        strcat(szBuffer, "PATTERNS.DAT");
+        strcat(szBuffer, "PATTERNS.DAT");*/
         unlinkf("%s", szBuffer);
       }
@@ -598 +603 @@
         CHAR s[CCHMAXPATH + 14];
 
-        save_dir2(s);
+        BldFullPathName(s, pFM2SaveDirectory, "PATTERNS.DAT");
+        /*save_dir2(s);
         if (s[strlen(s) - 1] != '\\')
           strcat(s, "\\");
-        strcat(s, "PATTERNS.DAT");
+        strcat(s, "PATTERNS.DAT");*/
         fp = _fsopen(s, "r", SH_DENYWR);
         if (fp) {
@@ -629 +635 @@
                                        LM_QUERYITEMCOUNT, MPVOID, MPVOID);
       if (sMax > 0) {
-        save_dir2(szBuffer);
+        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
+        /*save_dir2(szBuffer);
         if (szBuffer[strlen(szBuffer) - 1] != '\\')
           strcat(szBuffer, "\\");
-        strcat(szBuffer, "PATTERNS.DAT");
+        strcat(szBuffer, "PATTERNS.DAT");*/
         fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__);
         if (fp) {
@@ -649 +656 @@
       }
       else if (!sMax) {
-        save_dir2(szBuffer);
+        BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
+        /*save_dir2(szBuffer);
         if (szBuffer[strlen(szBuffer) - 1] != '\\')
           strcat(szBuffer, "\\");
-        strcat(szBuffer, "PATTERNS.DAT");
+        strcat(szBuffer, "PATTERNS.DAT");*/
         unlinkf("%s", szBuffer);
       }