Changeset 1075 for trunk/dll/init.c

Timestamp:

Jul 18, 2008, 6:44:01 AM (17 years ago)

Author:

Gregg Young

Message:

Debulked TMP code; Added comments;

File:

• trunk/dll/init.c (modified) (5 diffs)

trunk/dll/init.c

@@ -49 +49 @@
                 all the details view settings (both the global variables and those in the
                 DIRCNRDATA struct) into a new struct: DETAILS_SETTINGS.
+  16 JUL 08 GKY Use TMP directory for temp files
   17 Jul 08 SHL Reduce code bulk in fUseTmp setup
 
@@ -455 +456 @@
   /* cleanup */
   static CHAR s[CCHMAXPATH];
-  CHAR *enddir;
+  CHAR *enddir, szTempFile[CCHMAXPATH];
   HDIR search_handle;
   ULONG num_matches;
@@ -538 +539 @@
     DosFindClose(search_handle);
   }
-  if (fUseTmp) {
-    CHAR szTempFile[CCHMAXPATH];
-
-    BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
-    DosForceDelete(szTempFile);
-  }
-  else
-    DosForceDelete("$FM2PLAY.$$$");
-
+  BldFullPathName(szTempFile, pTmpDir, "$FM2PLAY.$$$");
+  DosForceDelete(szTempFile);
   EndNote();
   if (FM3ModHandle)
@@ -666 +660 @@
       if (fs3.attrFile & FILE_DIRECTORY) {
         // 17 Jul 08 SHL fixme to check writable someday
-        BldFullPathName(ArcTempRoot, env, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
         pTmpDir = xstrdup(env, pszSrcFile, __LINE__);
         fUseTmp = TRUE;
@@ -672 +665 @@
     }
   }
-  if (!fUseTmp) {
-    if (!fAmAV2)
-      strcpy(ArcTempRoot, "$FM$ARC$");
-    else
-      strcpy(ArcTempRoot, "$AV$ARC$");
-  }
+  BldFullPathName(ArcTempRoot, env, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
 
   /* initialize random number generator */