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

trunk/dll/init.c

@@ -51 +51 @@
   16 JUL 08 GKY Use TMP directory for temp files
   17 Jul 08 SHL Reduce code bulk in fUseTmp setup
+  19 Jul 08 GKY Use pFM2SaveDirectory, MakeTempName and move temp files to TMP subdirectory if (TMP).
 
 ***********************************************************************/
@@ -514 +515 @@
     }
   }
-
-  save_dir(s);
+  if (pTmpDir)
+    strcpy(s, pTmpDir);
+  else
+    save_dir2(s);
   if (s[strlen(s) - 1] != '\\')
     strcat(s, "\\");
   enddir = &s[strlen(s)];
-  strcat(s, LISTTEMPROOT);
+  strcat(s, "$FM2LI$T");
   strcat(s, "???");
   search_handle = HDIR_CREATE;
@@ -541 +544 @@
   BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
   DosForceDelete(szTempFile);
+  if (pTmpDir) {
+    wipeallf("%s\\*", pTmpDir);
+    DosDeleteDir(pTmpDir);
+  }
   EndNote();
   if (FM3ModHandle)
@@ -650 +657 @@
   }
 
-  /* set up default root names for temp archive goodies */
+  // set up default root names for temp file storage and archive goodies
   env = getenv("TMP");
   if (env == NULL)
@@ -659 +666 @@
     if (!rc) {
       if (fs3.attrFile & FILE_DIRECTORY) {
-        // 17 Jul 08 SHL fixme to check writable someday
-        pTmpDir = xstrdup(env, pszSrcFile, __LINE__);
+        CHAR szTempName[CCHMAXPATH];
+        APIRET ret = 0;
+        // 17 Jul 08 SHL fixme to check writable someday
+        strcpy(szTempName, env);
+        //if (szTempName[strlen(szTempName) - 1] != '\\')
+        //  strcat(szTempName, "\\");
+        MakeTempName(szTempName, NULL, 1);
+        ret = DosCreateDir(szTempName, 0);
+        if (!ret) {
+          pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);
+        }
       }
     }
@@ -666 +682 @@
   BldFullPathName(ArcTempRoot, pTmpDir, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
 
-  /* initialize random number generator */
+  //Save the FM2 save directory name. This is the location of the ini, dat files etc.
+  {
+    CHAR temp[CCHMAXPATH];
+    save_dir2(temp);
+    pFM2SaveDirectory = xstrdup(temp, pszSrcFile, __LINE__);
+  }
+
+  // initialize random number generator
   srand(time(NULL) + clock());