Changeset 1118 for trunk/dll/avv.c

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)

File:

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

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)