Changeset 1117

Timestamp:

Aug 24, 2008, 8:31:35 PM (17 years ago)

Author:

Gregg Young

Message:

Check disk free space before writing data files to prevent traps from being on a full disk (ticket 154)

Location:

trunk/dll

Files:

• arccnrs.c (modified) (1 diff)
• assoc.c (modified) (1 diff)
• cmdline.c (modified) (1 diff)
• command.c (modified) (1 diff)
• filter.c (modified) (1 diff)
• fm3dll.h (modified) (1 diff)
• grep2.c (modified) (1 diff)
• init.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/arccnrs.c

@@ -445 +445 @@
   arctemp = xmallocz(CCHMAXPATH, pszSrcFile, __LINE__);
   MakeTempName(arctemp, ArcTempRoot, 2);
-  /*for (x = 0; x < 99; x++) {
-    sprintf(arctemp, "%s.%03x", ArcTempRoot, (clock() & 4095L));
-    if (IsFile(arctemp) == 1)
-      DosSleep(rand() % 100);
-    else
-      break;
-  } */
-
-  //printf("%s\r", arctemp); fflush(stdout);
 
 ReTry:

trunk/dll/assoc.c

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

trunk/dll/cmdline.c

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

trunk/dll/command.c

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

trunk/dll/filter.c

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

trunk/dll/fm3dll.h

@@ -1192 +1192 @@
 
 DATADEF ULONG ulCnrType, FilesToGet, AutoviewHeight, TreeWidth, FM3UL;
-DATADEF ULONGLONG ullTmpSpaceNeeded;
+DATADEF ULONGLONG ullTmpSpaceNeeded, ullDATFileSpaceNeeded;
 DATADEF long prnwidth, prnlength, prntmargin, prnbmargin, prnlmargin,
   prnrmargin, prnspacing, prntabspaces;

trunk/dll/grep2.c

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

trunk/dll/init.c

@@ -1093 +1093 @@
   prntabspaces = 8;
   CollectorsortFlags = sortFlags = SORT_DIRSFIRST;
+  ullDATFileSpaceNeeded = 10000;
 
   //Get default Country info

trunk/dll/remap.c

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

trunk/dll/saveclip.c

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

trunk/dll/tools.c

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

trunk/dll/walkem.c

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