Changeset 1069 for trunk/dll/init.c

Timestamp:

Jul 17, 2008, 1:53:38 AM (17 years ago)

Author:

Gregg Young

Message:

Fixes trap on viewing multiple files from an archive Ticket 248. Also includes initial code for using TMP directory for Temp files.

File:

• trunk/dll/init.c (modified) (1 diff)

trunk/dll/init.c

@@ -650 +650 @@
 
   /* set up default root names for temp archive goodies */
-  if (!fAmAV2)
-    strcpy(ArcTempRoot, "$FM$ARC$");
-  else
-    strcpy(ArcTempRoot, "$AV$ARC$");
+  env = getenv("TMP");
+  if (env != NULL) {
+    DosError(FERR_DISABLEHARDERR);
+    rc = DosQueryPathInfo(env, FIL_STANDARD, &fs3, sizeof(fs3));
+    if (!rc) {
+      if (fs3.attrFile & FILE_DIRECTORY) {
+        BldFullPathName(ArcTempRoot, env, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
+        pTmpDir = xstrdup(env, pszSrcFile, __LINE__);
+        fUseTmp = TRUE;
+      }
+    }
+  }
+  else {
+    env = getenv("TEMP");
+    if (env != NULL) {
+      DosError(FERR_DISABLEHARDERR);
+      rc = DosQueryPathInfo(env, FIL_STANDARD, &fs3, sizeof(fs3));
+      if (!rc) {
+        if (fs3.attrFile & FILE_DIRECTORY) {
+          BldFullPathName(ArcTempRoot, env, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
+          pTmpDir = xstrdup(env, pszSrcFile, __LINE__);
+          fUseTmp = TRUE;
+        }
+      }
+    }
+  }
+  if (!fUseTmp) {
+    if (!fAmAV2)
+      strcpy(ArcTempRoot, "$FM$ARC$");
+    else
+      strcpy(ArcTempRoot, "$AV$ARC$");
+  }
 
   /* initialize random number generator */