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

trunk/dll/inis.c

@@ -26 +26 @@
   09 Jan 08 SHL Use CloseProfile to avoid spurious system INI closes
   29 Feb 08 GKY Use xfree where appropriate
+  19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory or pTmpDir and use BldFullPathName
 
 ***********************************************************************/
@@ -46 +47 @@
 #include "errutil.h"                    // Dos_Error...
 #include "strutil.h"                    // GetPString
+#include "pathutil.h"                   // BldFullPathName
 #include "fm3dll.h"
 #include "fortify.h"
@@ -1134 +1136 @@
         /* make copies of new inis */
         *tempuserini = 0;
-        *tempsysini = 0;
-        save_dir2(tempuserini);
+        *tempsysini = 0;
+        BldFullPathName(tempuserini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPUSER.INI");
+        /*save_dir2(tempuserini);
         if (tempuserini[strlen(tempuserini) - 1] != '\\')
           strcat(tempuserini, "\\");
-        strcat(tempuserini, "TEMPUSER.INI");
+        strcat(tempuserini, "TEMPUSER.INI");*/
         rc = DosCopy(userini, tempuserini, DCPY_EXISTING);
         if (rc) {
@@ -1148 +1151 @@
                     GetPString(IDS_COMPCOPYFAILEDTEXT), userini, tempuserini);
           break;
-        }
-        save_dir2(tempsysini);
+        }
+        BldFullPathName(tempsysini, pTmpDir ? pTmpDir : pFM2SaveDirectory, "TEMPSYS.INI");
+        /*save_dir2(tempsysini);
         if (tempsysini[strlen(tempsysini) - 1] != '\\')
           strcat(tempsysini, "\\");
-        strcat(tempsysini, "TEMPSYS.INI");
+        strcat(tempsysini, "TEMPSYS.INI");*/
         rc = DosCopy(sysini, tempsysini, DCPY_EXISTING);
         if (rc) {