Changeset 1112 for trunk/dll

Timestamp:

Aug 24, 2008, 5:13:20 AM (17 years ago)

Author:

Gregg Young

Message:

Check free space on TMP & FM2 save directory drives at start up (Ticket 268)

Location:

trunk/dll

Files:

• fm3dll.h (modified) (2 diffs)
• fm3dll.str (modified) (1 diff)
• fm3str.h (modified) (1 diff)
• init.c (modified) (3 diffs)
• misc.c (modified) (2 diffs)

trunk/dll/fm3dll.h

@@ -545 +545 @@
 void SetupWinList(HWND hwndMenu, HWND hwndTop, HWND hwndFrame);
 BOOL SwitchCommand(HWND hwndMenu, USHORT cmd);
+INT CheckDriveSpaceAvail(CHAR *pTargetPath, ULONGLONG ullSpaceNeeded,
+                         ULONGLONG ullFreeSpaceWhenComplete);
 
 /* mainwnd.c */
@@ -1190 +1192 @@
 
 DATADEF ULONG ulCnrType, FilesToGet, AutoviewHeight, TreeWidth, FM3UL;
+DATADEF ULONGLONG ullTmpSpaceNeeded;
 DATADEF long prnwidth, prnlength, prntmargin, prnbmargin, prnlmargin,
   prnrmargin, prnspacing, prntabspaces;

trunk/dll/fm3dll.str

@@ -85 +85 @@
  [Rescan suggested]
 Dri~ves...
-
-
-
-
-
-
+The target path %s will have less then %s bytes of space remaining following this operation. Do you wish to continue?
+The TMP directory %s has less then %s of space. Do you wish to use the FM/2 save directory for temporary files? In any case you should free some space on this drive
+The TMP directory %s has less then %s of space & The FM/2 save directory %s has less then %s of space. You should free some space on these drives
+The FM2 save directory %s has less then %s of space. You should free some space on this drive
+The target path %s will have less then %s bytes of space remaining following this operation. You should free some space on this drive immediately
+The target path %s has inadequate space remaining for the operation requested. Free some space and try again.
 
 /OPEN

trunk/dll/fm3str.h

@@ -116 +116 @@
 #define IDS_RESCANSUGGESTEDTEXT                               84
 #define IDS_DRIVESMENUTEXT                                    85
+#define IDS_DRIVESPACELIMITED                                 86
+#define IDS_TMPDRIVESPACELIMITED                              87
+#define IDS_SAVETMPDRIVESPACELIMITED                          88
+#define IDS_SAVEDRIVESPACELIMITED                             89
+#define IDS_DRIVESPACELIMITEDTMPSAVE                          90
+#define IDS_DRIVESPACEEXCEEDED                                91
 #define IDS_OPENCMDTEXT                                       93
 #define IDS_CLOSECMDTEXT                                      94

trunk/dll/init.c

@@ -55 +55 @@
   20 Jul 08 GKY Add support to delete orphaned tmp directories without deleting tmp of other
                 running sessions
+  23 Aug 08 GKY Check that space on TMP & FM2 save drives exceed 5 GiB; Done to allow user setting of
+                minimum size in future
 
 ***********************************************************************/
@@ -716 +718 @@
     }
   }
-  BldFullPathName(ArcTempRoot, pTmpDir, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
 
   //Save the FM2 save directory name. This is the location of the ini, dat files etc.
@@ -724 +725 @@
     pFM2SaveDirectory = xstrdup(temp, pszSrcFile, __LINE__);
   }
+  {
+    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){
+        ret = saymsg(MB_YESNO,
+                     HWND_DESKTOP,
+                     NullStr,
+                     GetPString(IDS_TMPDRIVESPACELIMITED),
+                     pTmpDir,
+                     szKBTmp);
+        if (ret == MBID_YES)
+          pTmpDir = pFM2SaveDirectory;
+      }
+      else
+        saymsg(MB_OK,
+               HWND_DESKTOP,
+               NullStr,
+               GetPString(IDS_SAVETMPDRIVESPACELIMITED),
+               pTmpDir,
+               szKBTmp,
+               pFM2SaveDirectory,
+               szKBTmp);
+    }
+    else if (CheckDriveSpaceAvail(pFM2SaveDirectory, ullTmpSpaceNeeded, 0) == 1)
+      saymsg(MB_OK,
+             HWND_DESKTOP,
+             NullStr,
+             GetPString(IDS_SAVEDRIVESPACELIMITED),
+             pFM2SaveDirectory,
+             szKBTmp);
+  }
+  BldFullPathName(ArcTempRoot, pTmpDir, fAmAV2 ? "$AV$ARC$" : "$FM$ARC$");
 
   // initialize random number generator

trunk/dll/misc.c

@@ -51 +51 @@
   20 Jul 08 GKY Add save/append filename to clipboard.
                 Change menu wording to make these easier to find
+  23 Aug 08 GKY Add CheckDriveSpaceAvail To pre check drive space to prevent failures
 
 ***********************************************************************/
@@ -2216 +2217 @@
 }
 
+/** CheckDriveSpaceAvail
+ *  Take space needed and checks that drive has at least 1000 bits in excess of the required space.
+ *  Returns 0 if sufficient space is available; 1 if the drive is full & 2 on abort of operation
+ *  when the drive would have less than ullFreeSpaceWhenComplete remaining or has insufficient space.
+ */
+
+INT CheckDriveSpaceAvail(CHAR *pTargetPath, ULONGLONG ullSpaceNeeded,
+                          ULONGLONG ullFreeSpaceWhenComplete)
+{
+  FSALLOCATE fsa;
+  ULONGLONG  ullFreeQty;
+  APIRET ret;
+
+  DosQueryFSInfo(toupper(*pTargetPath) - 'A' + 1, FSIL_ALLOC, &fsa, sizeof(FSALLOCATE));
+  ullFreeQty = (ULONGLONG) fsa.cUnitAvail * (fsa.cSectorUnit * fsa.cbSector);
+  if (ullFreeQty > ullSpaceNeeded + ullFreeSpaceWhenComplete)
+    return 0;
+  else if (ullFreeQty < ullSpaceNeeded + 1024) {
+    CHAR szKB[20];
+
+    if (ullFreeSpaceWhenComplete == 0)
+      ullSpaceNeeded = 0;
+    commafmt(szKB, sizeof(szKB),
+             (ULONG) ullFreeQty - ullSpaceNeeded);
+    if (ullFreeSpaceWhenComplete == 0) {
+      saymsg(MB_OK,
+             HWND_DESKTOP,
+             NullStr,
+             GetPString(IDS_DRIVESPACELIMITEDTMPSAVE),
+             pTargetPath,
+             szKB);
+      return 0;
+    }
+    else {
+      if (ullFreeQty - ullSpaceNeeded > 0) {
+        ret = saymsg(MB_YESNO,
+                     HWND_DESKTOP,
+                     NullStr,
+                     GetPString(IDS_DRIVESPACELIMITED),
+                     pTargetPath,
+                     szKB);
+        if (ret == MBID_YES)
+          return 0;
+        else
+          return 2;
+      }
+      else {
+        saymsg(MB_OK,
+               HWND_DESKTOP,
+               NullStr,
+               GetPString(IDS_DRIVESPACEEXCEEDED),
+               pTargetPath);
+        return 2;
+      }
+    }
+  }
+  else
+    return 1;
+}
+
 #pragma alloc_text(MAINWND5,SetSysMenu)
 #pragma alloc_text(MISC1,BoxWindow,PaintRecessedWindow,PostMsg,PaintSTextWindow,IsFm2Window)
 #pragma alloc_text(MISC1,FixSwitchList,FindDirCnr,CurrentRecord,SetShiftState,AddToListboxBottom)
+#pragma alloc_text(MISC1,CheckDriveSpaceAvail)
 
 #ifdef FORTIFY