Changeset 1116 for trunk/dll

Timestamp:

Aug 24, 2008, 8:28:25 PM (17 years ago)

Author:

Gregg Young

Message:

Modify COPY/Move checks to account for large file support. (Ticket 256)

Location:

trunk/dll

Files:

• seeall.c (modified) (3 diffs)
• worker.c (modified) (3 diffs)

trunk/dll/seeall.c

@@ -715 +715 @@
 
                 FSALLOCATE fsa;
-                ULONG clFreeBytes;
+                ULONGLONG ullFreeBytes;
                 CHAR *ptr;
                 INT cntr;
@@ -724 +724 @@
                 if (!DosQueryFSInfo(toupper(*newname) - '@',
                                     FSIL_ALLOC, &fsa, sizeof(fsa))) {
-                  // Assume <2GB since file did not fit
-                  clFreeBytes = fsa.cUnitAvail * fsa.cSectorUnit *
+                  // Assume large file support
+                  ullFreeBytes = (ULONGLONG) fsa.cUnitAvail * fsa.cSectorUnit *
                                 fsa.cbSector;
-                  if (clFreeBytes) {
+                  if (ullFreeBytes) {
                     // Find item that will fit in available space
                     for (cntr = x + 1; list[cntr]; cntr++) {
@@ -736 +736 @@
                           !(fs4.attrFile & FILE_DIRECTORY) &&
                           // fixme to use CBLIST_TO_EASIZE?
-                          fs4.cbFile + fs4.cbList <= clFreeBytes) {
+                          fs4.cbFile + fs4.cbList <= ullFreeBytes) {
                         // Swap with failing item
                         ptr = list[x];

trunk/dll/worker.c

@@ -786 +786 @@
 
                       FSALLOCATE fsa;
-                      ULONG clFreeBytes;
+                      ULONGLONG ullFreeBytes;
                       CHAR *ptr;
                       INT cntr;
@@ -795 +795 @@
                                           FSIL_ALLOC,
                                           &fsa, sizeof(FSALLOCATE))) {
-                        // Assume <2GB since file did not fit
-                        clFreeBytes = fsa.cUnitAvail * fsa.cSectorUnit *
+                        // Assume large file support
+                        ullFreeBytes = (ULONGLONG) fsa.cUnitAvail * fsa.cSectorUnit *
                           fsa.cbSector;
-                        if (clFreeBytes) {
+                        if (ullFreeBytes) {
                           // Find item that will fit in available space
                           for (cntr = x + 1; wk->li->list[cntr]; cntr++) {
@@ -808 +808 @@
                                 !(fs4.attrFile & FILE_DIRECTORY) &&
                                 // fixme to use CBLIST_TO_EASIZE?
-                                fs4.cbFile + fs4.cbList <= clFreeBytes) {
+                                fs4.cbFile + fs4.cbList <= ullFreeBytes) {
                               // Swap with failing item
                               ptr = wk->li->list[x];