Changeset 1118 for trunk/dll

Timestamp:

Aug 24, 2008, 10:52:23 PM (17 years ago)

Author:

Gregg Young

Message:

Clean up of fix for trap caused by FM/2 being on a full disk. It now preserves the data files. (Ticket 152, 271)

Location:

trunk/dll

Files:

• assoc.c (modified) (1 diff)
• avv.c (modified) (5 diffs)
• cmdline.c (modified) (1 diff)
• command.c (modified) (1 diff)
• filter.c (modified) (1 diff)
• grep2.c (modified) (1 diff)
• misc.c (modified) (1 diff)
• remap.c (modified) (1 diff)
• saveclip.c (modified) (2 diffs)
• tools.c (modified) (2 diffs)
• walkem.c (modified) (1 diff)

trunk/dll/assoc.c

@@ -266 +266 @@
 #endif
   BldFullPathName(s, pFM2SaveDirectory, "ASSOC.DAT");
-  if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 0) == 2)
+  if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
   fp = xfopen(s, "w", pszSrcFile, __LINE__);

trunk/dll/avv.c

@@ -182 +182 @@
 }
 
-#pragma alloc_text (AVV2,nonull,rewrite_archiverbb2,checkfile)
 
 // nonull - convert NULL pointer to empty string
@@ -225 +224 @@
     archiverbb2 = GetPString(IDS_ARCHIVERBB2);
   }
+  /* Check space on drive*/
+  if (CheckDriveSpaceAvail(archiverbb2, ullDATFileSpaceNeeded * 4, 1) == 2) //* 4 is because this file is larger than other .dat files
+    return; //already gave error msg
 
   /* save a backup */
@@ -236 +238 @@
     fpOld = fopen(sz, "r");             // OK for file not to exist
   }
-  if (CheckDriveSpaceAvail(archiverbb2, ullDATFileSpaceNeeded * 4, 0) == 2) //* 4 is because this file is larger than other .dat files
-    return; //already gave error msg
+
   fpNew = fopen(archiverbb2, "w");
 
@@ -402 +403 @@
 }
 
-#pragma alloc_text (AVV3,check_archiver,ArcReviewDlgProc)
 
 static BOOL check_archiver(HWND hwnd, ARC_TYPE * info)
@@ -967 +967 @@
 #pragma alloc_text(AVV,get_long_from_window,get_int3_from_window)
 #pragma alloc_text(AVV,get_int4_from_window,free_and_strdup_quoted_from_window)
+#pragma alloc_text (AVV2,nonull,rewrite_archiverbb2,checkfile)
+#pragma alloc_text (AVV3,check_archiver,ArcReviewDlgProc)

trunk/dll/cmdline.c

@@ -129 +129 @@
     return;
   BldFullPathName(pszCmdLine, pFM2SaveDirectory, (DoItYourself) ? "CMDLINES.DAT" : "CMDMINI.DAT");
-  if (CheckDriveSpaceAvail(pszCmdLine, ullDATFileSpaceNeeded, 0) == 2)
+  if (CheckDriveSpaceAvail(pszCmdLine, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
   if (CmdLineHead) {

trunk/dll/command.c

@@ -398 +398 @@
   info = cmdhead;
   BldFullPathName(s, pFM2SaveDirectory, "COMMANDS.DAT");
-  if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 0) == 2)
+  if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
   fp = xfopen(s, "w", pszSrcFile, __LINE__);

trunk/dll/filter.c

@@ -175 +175 @@
   if (maskhead) {
     BldFullPathName(s, pFM2SaveDirectory, "FILTER.DAT");
-    if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 0) == 2)
+    if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
     fp = xfopen(s, "w", pszSrcFile, __LINE__);

trunk/dll/grep2.c

@@ -948 +948 @@
         if (sSelect > 0) {
           BldFullPathName(s, pFM2SaveDirectory, "GREPMASK.DAT");
-          if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 0) == 2)
+          if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
             break; //already gave error msg
           fp = xfopen(s, "w", pszSrcFile, __LINE__);

trunk/dll/misc.c

@@ -2251 +2251 @@
     }
     else {
-      if (ullFreeQty - ullSpaceNeeded > 0) {
+      if (ullFreeQty > ullSpaceNeeded) {
         ret = saymsg(MB_YESNO,
                      HWND_DESKTOP,

trunk/dll/remap.c

@@ -112 +112 @@
     return;
   BldFullPathName(s, pFM2SaveDirectory, "RESOURCE.DAT");
-  if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 0) == 2)
+  if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
   if (reshead) {

trunk/dll/saveclip.c

@@ -282 +282 @@
       if (sMax > 0) {
         BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
-        if (CheckDriveSpaceAvail(szBuffer, ullDATFileSpaceNeeded, 0) == 2)
+        if (CheckDriveSpaceAvail(szBuffer, ullDATFileSpaceNeeded, 1) == 2)
           break; //already gave error msg
         fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__);
@@ -637 +637 @@
       if (sMax > 0) {
         BldFullPathName(szBuffer, pFM2SaveDirectory, "PATTERNS.DAT");
-        if (CheckDriveSpaceAvail(szBuffer, ullDATFileSpaceNeeded, 0) == 2)
+        if (CheckDriveSpaceAvail(szBuffer, ullDATFileSpaceNeeded, 1) == 2)
           break; //already gave error msg
         fp = xfopen(szBuffer, "w", pszSrcFile, __LINE__);

trunk/dll/tools.c

@@ -93 +93 @@
     return;
   BldFullPathName(s, pFM2SaveDirectory, "QUICKTLS.DAT");
-  if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 0) == 2)
+  if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
   fp = xfopen(s, "w", pszSrcFile, __LINE__);
@@ -210 +210 @@
     return;
   }
-  if (CheckDriveSpaceAvail(filename, ullDATFileSpaceNeeded, 0) == 2)
+  if (CheckDriveSpaceAvail(filename, ullDATFileSpaceNeeded, 1) == 2)
     return; //already gave error msg
   fp = xfopen(filename, "w", pszSrcFile, __LINE__);

trunk/dll/walkem.c

@@ -403 +403 @@
     if (udirhead) {
       BldFullPathName(s, pFM2SaveDirectory, "USERDIRS.DAT");
-      if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 0) == 2)
+      if (CheckDriveSpaceAvail(s, ullDATFileSpaceNeeded, 1) == 2)
         return; //already gave error msg
       fp = xfopen(s, "w", pszSrcFile, __LINE__);