Changeset 1554 for trunk/dll/init.c

Timestamp:

Nov 21, 2010, 12:35:35 AM (15 years ago)

Author:

Gregg Young

Message:

Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused by temp file creation failures. (Ticket 440)

File:

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

trunk/dll/init.c

@@ -101 +101 @@
                 entries in the tree container, fix related semaphore performance using
                 combination of event and mutex semaphores
+  20 Nov 10 GKY Check that pTmpDir IsValid and recreate if not found; Fixes hangs caused
+                by temp file creation failures.
 
 ***********************************************************************/
@@ -582 +584 @@
     strcpy(s, pFM2SaveDirectory);
   AddBackslashToPath(s);
-  //if (s[strlen(s) - 1] != '\\')
-  //  strcat(s, "\\");
   enddir = &s[strlen(s)];
   strcat(s, "$FM2LI$T.");
@@ -729 +729 @@
       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);
@@ -767 +770 @@
         rc = DosCreateDir(szTempName, 0);
         if (!rc)
-          pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);  // if writable
+          pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);  // if writable
+        else
+          pTmpDir = xstrdup(pFM2SaveDirectory, pszSrcFile, __LINE__); 
         }
       }
     }
-
-  //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__);
-  }
   // Check free space on TMP and FM2 Save drives
   {