Changeset 1120 for trunk/dll/arccnrs.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/arccnrs.c (modified) (6 diffs)

trunk/dll/arccnrs.c

@@ -57 +57 @@
   16 Jul 08 GKY Use TMP directory for temp files if present. Use MakeTempName
   19 Jul 08 GKY Replace save_dir2(dir) with pFM2SaveDirectory
+  25 Aug 08 GKY 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)
 
 ***********************************************************************/
@@ -444 +446 @@
     info = find_type(arcname, NULL);
   arctemp = xmallocz(CCHMAXPATH, pszSrcFile, __LINE__);
+  if (CheckDriveSpaceAvail(ArcTempRoot, ullDATFileSpaceNeeded, ullTmpSpaceNeeded) == 1)
+    saymsg(MB_OK,
+           HWND_DESKTOP,
+           NullStr,
+           GetPString(IDS_ARCTMPDRIVESPACELIMITED),
+           ArcTempRoot);
   MakeTempName(arctemp, ArcTempRoot, 2);
+
 
 ReTry:
@@ -2135 +2144 @@
                          CM_SEARCHSTRING,
                          MPFROMP(&srch), MPFROMLONG(CMA_FIRST));
-        if (pci && (INT) pci != -1) {
-
-          USHORT attrib = CRA_CURSORED;
+        if (pci && (INT) pci != -1) {
+
+          USHORT attrib = CRA_CURSORED;
+
 
           /* make found item current item */
@@ -2281 +2291 @@
                            CM_QUERYRECORDEMPHASIS,
                            MPFROMLONG(CMA_FIRST), MPFROMSHORT(CRA_CURSORED));
-          if (pci && (INT) pci != -1) {
+          if (pci && (INT) pci != -1) {
             if (fSplitStatus && hwndStatus2) {
               if (dcd->ullTotalBytes)
@@ -2635 +2645 @@
         OpenDirCnr((HWND) 0, hwndMain, dcd->hwndFrame, FALSE, (char *)mp1);
       }
-      else if (mp1 && IsFile(mp1) == 1) {
+      else if (mp1 && IsFile(mp1) == 1 &&
+               CheckDriveSpaceAvail(ArcTempRoot, ullDATFileSpaceNeeded, ullTmpSpaceNeeded) != 2) {
         StartArcCnr(HWND_DESKTOP,
                     dcd->hwndFrame, (CHAR *) mp1, 4, (ARC_TYPE *) mp2);
@@ -3365 +3376 @@
     ArcMenu = ArcCnrMenu = (HWND) 0;
     EmptyArcCnr(hwnd);
+#     ifdef FORTIFY
+    Fortify_LeaveScope();
+#     endif
     break;
   }