Changeset 1603

Timestamp:

Aug 6, 2011, 11:20:56 PM (14 years ago)

Author:

Gregg Young

Message:

If both TEMP and TMP environment variables are missing or point to invalid directories the FM2SaveDirectory doesn't get set. This fixes it and probably the trap in Ticket 468

File:

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

trunk/dll/init.c

@@ -637 +637 @@
   PSZ env;
   CHAR dllfile[CCHMAXPATH];
+  CHAR temp[CCHMAXPATH];
   ULONG size;
   BOOL fSeparateParmsApp;
@@ -717 +718 @@
   }
 
+  //Save the FM2 save directory name. This is the location of the ini, dat files etc.
+  save_dir2(temp);
+  pFM2SaveDirectory = xstrdup(temp, pszSrcFile, __LINE__);
   // set up default root names for temp file storage and archive goodies
   env = getenv("TMP");
@@ -725 +729 @@
     rc = DosQueryPathInfo(env, FIL_STANDARD, &fs3, sizeof(fs3));
     if (!rc) {
-      CHAR *enddir, *p, szTempName[CCHMAXPATH], temp[CCHMAXPATH];
+      CHAR *enddir, *p, szTempName[CCHMAXPATH];
       FILEFINDBUF3 ffb;
       HDIR search_handle;
       ULONG num_matches, ul;
 
-      //Save the FM2 save directory name. This is the location of the ini, dat files etc.
-      save_dir2(temp);
-      pFM2SaveDirectory = xstrdup(temp, pszSrcFile, __LINE__);
       strcpy(szTempName, env);
       AddBackslashToPath(szTempName);
-      //if (szTempName[strlen(szTempName) - 1] != '\\')
-      //  strcat(szTempName, "\\");
       enddir = &szTempName[strlen(szTempName)];
       strcat(szTempName, "$FM2????.");
@@ -747 +746 @@
                         FILE_SYSTEM | FILE_READONLY | FILE_HIDDEN |
                         FILE_ARCHIVED,
-                        &ffb, sizeof(ffb), &num_matches, FIL_STANDARD)) {
-        do {
+                        &ffb, sizeof(ffb), &num_matches, FIL_STANDARD)) {
+        do {
           strcpy(enddir, ffb.achName);
           p = strrchr(szTempName, '.');
@@ -761 +760 @@
             }
           }
-        }
-      while (!DosFindNext(search_handle,
-                          &ffb, sizeof(ffb), &num_matches));
-      DosFindClose(search_handle);
-    }
+        }
+        while (!DosFindNext(search_handle,
+                            &ffb, sizeof(ffb), &num_matches));
+        DosFindClose(search_handle);
+      }
       if (fs3.attrFile & FILE_DIRECTORY) {
         strcpy(szTempName, env);
@@ -773 +772 @@
           pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);  // if writable
         else
-          pTmpDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__); 
-        }
+          pTmpDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__);
       }
     }
+  }
+  else
+    pTmpDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__);
   // Check free space on TMP and FM2 Save drives
   {
-    //ullTmpSpaceNeeded = 5120000;
     if (pTmpDir && CheckDriveSpaceAvail(pTmpDir, ullTmpSpaceNeeded, 0) == 1) {
       if (CheckDriveSpaceAvail(pFM2SaveDirectory, ullTmpSpaceNeeded, 0) == 0){