Changeset 1074 for trunk/dll/init.c

Timestamp:

Jul 18, 2008, 4:43:32 AM (17 years ago)

Author:

Steven Levine

Message:

Reduce code bulk in fUseTmp setup

File:

• trunk/dll/init.c (modified) (3 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.
+  17 Jul 08 SHL Reduce code bulk in fUseTmp setup
 
 ***********************************************************************/
@@ -657 +658 @@
   /* set up default root names for temp archive goodies */
   env = getenv("TMP");
+  if (env == NULL)
+    env = getenv("TEMP");
   if (env != NULL) {
     DosError(FERR_DISABLEHARDERR);
@@ -662 +665 @@
     if (!rc) {
       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;
-      }
-    }
-  }
-  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;
-        }
       }
     }