Changeset 1120 for trunk/dll/init.c

Timestamp:

Aug 26, 2008, 3:08:28 AM (17 years ago)

Author:

Gregg Young

Message:

Check TMP directory space warn if lee than 5 MiB prevent archiver from opening if less than 10 KiB (It hangs and can't be closed) (Ticket 214) Also some cleanup of the error messages for CheckDriveSpaceAvail.

File:

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

trunk/dll/init.c

@@ -714 +714 @@
         if (!ret) {   //check writable
           pTmpDir = xstrdup(szTempName, pszSrcFile, __LINE__);
-        } //fixme to check freespace > 5 MB
+        }
       }
     }
@@ -725 +725 @@
     pFM2SaveDirectory = xstrdup(temp, pszSrcFile, __LINE__);
   }
+  // Check free space on TMP and FM2 Save drives
   {
-    CHAR szKBTmp[20];
-
     ullTmpSpaceNeeded = 5120000;
-    CommaFmtULL(szKBTmp, sizeof(szKBTmp),
-                ullTmpSpaceNeeded, 'M');
-    printf("%s\r", szKBTmp); fflush(stdout);
     if (pTmpDir && CheckDriveSpaceAvail(pTmpDir, ullTmpSpaceNeeded, 0) == 1) {
       if (CheckDriveSpaceAvail(pFM2SaveDirectory, ullTmpSpaceNeeded, 0) == 0){
@@ -738 +734 @@
                      NullStr,
                      GetPString(IDS_TMPDRIVESPACELIMITED),
-                     pTmpDir,
-                     szKBTmp);
+                     pTmpDir);
         if (ret == MBID_YES)
           pTmpDir = pFM2SaveDirectory;
@@ -749 +744 @@
                GetPString(IDS_SAVETMPDRIVESPACELIMITED),
                pTmpDir,
-               szKBTmp,
-               pFM2SaveDirectory,
-               szKBTmp);
+               pFM2SaveDirectory);
     }
     else if (CheckDriveSpaceAvail(pFM2SaveDirectory, ullTmpSpaceNeeded, 0) == 1)
@@ -758 +751 @@
              NullStr,
              GetPString(IDS_SAVEDRIVESPACELIMITED),
-             pFM2SaveDirectory,
-             szKBTmp);
+             pFM2SaveDirectory);
   }
   BldFullPathName(ArcTempRoot, pTmpDir, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");