Changeset 36 for trunk/dll/worker.c

Timestamp:

Oct 17, 2002, 3:53:23 AM (23 years ago)

Author:

root

Message:

Handle large partitions

File:

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

trunk/dll/worker.c

@@ +1 @@
+
+/***********************************************************************
+
+  $Id$
+
+  Worker thread
+
+  Copyright (c) 1993-98 M. Kimes
+  Copyright (c) 2001, 2002 Steven H.Levine
+
+  Revisions     16 Oct 02 SHL - Comments
+
+***********************************************************************/
+
 #define INCL_DOS
 #define INCL_WIN
@@ -689 +703 @@
                     existed = (IsFile(newname) != -1);
                     isnewer = IsNewer(wk->li->list[x],newname);
-/*
-{
-static char temp[CCHMAXPATH * 3];
-
-sprintf(temp,"Target: %s\rSource: %s\rOverold: %lu\rOvernew: %lu\rIsNewer: %lu\rExisted: %lu",newname,wk->li->list[x],overold,overnew,isnewer,existed);
-saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,temp);
-}
-*/
+                    /*
+                    {
+                      char temp[CCHMAXPATH * 3];
+                      sprintf(temp,"Target: %s\rSource: %s\rOverold: %lu\rOvernew: %lu\rIsNewer: %lu\rExisted: %lu",newname,wk->li->list[x],overold,overnew,isnewer,existed);
+                      saymsg(MB_ENTER,HWND_DESKTOP,DEBUG_STRING,temp);
+                    }
+                    */
                     if(existed &&
                        wk->li->type != IDM_RENAME &&
@@ -810 +823 @@
 
                         FSALLOCATE  fsa;
-                        ULONG       totalsize;
+                        ULONG       clFreeBytes;
                         CHAR       *ptr;
                         INT         cntr;
@@ -820 +833 @@
                                            &fsa,
                                            sizeof(FSALLOCATE))) {
-                          totalsize = fsa.cUnitAvail * fsa.cSectorUnit *
+                          // Assume <2GB since file did not fit
+                          clFreeBytes = fsa.cUnitAvail * fsa.cSectorUnit *
                                       fsa.cbSector;
-                          if(totalsize) {
+                          if(clFreeBytes) {
+                            // Find item that will fit in available space
                             for(cntr = x + 1;wk->li->list[cntr];cntr++) {
                               DosError(FERR_DISABLEHARDERR);
@@ -830 +845 @@
                                                    sizeof(fs4)) &&
                                  !(fs4.attrFile & FILE_DIRECTORY) &&
-                                 fs4.cbFile + fs4.cbList <= totalsize) {
+                                 fs4.cbFile + fs4.cbList <= clFreeBytes) {
+                                // Swap with failing item
                                 ptr = wk->li->list[x];
                                 wk->li->list[x] = wk->li->list[cntr];