Changeset 90

Timestamp:

May 21, 2004, 5:15:19 PM (21 years ago)

Author:

root

Message:

ProcessDirectory: avoid most large drive failures

File:

• trunk/dll/filldir.c (modified) (16 diffs)

trunk/dll/filldir.c ¶

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2003 Steven H.Levine
+  Copyright (c) 2001, 2004 Steven H.Levine
 
   Revisions     12 Sep 02 SHL - Rework symbols to understand code
                 08 Feb 03 SHL - DropHelp: calc EA size consistently
                 11 Jun 03 SHL - Add JFS and FAT32 support
+                10 Jan 04 SHL - ProcessDirectory: avoid most large drive failures
 
 ***********************************************************************/
@@ -33 +34 @@
 
 
-HPOINTER IDFile (ULONG cmp) {
-
+HPOINTER IDFile (ULONG cmp)
+{
   HPOINTER hptr;
 
@@ -523 +524 @@
   PFILEFINDBUF4  paffbFound,*papffbSelected,pffbFile,paffbTotal = NULL,paffbTemp;
   HDIR           hdir = HDIR_CREATE;
-  ULONG          ulMaxFiles,ulExtraBytes,ulM = 1L,ulTotal = 0L;
-  LONG           numbytes,totalbytes,returnbytes = 0L;
+  ULONG          ulMaxFiles,ulExtraBytes,ulM = 1,ulTotal = 0L;
+  ULONG          numbytes,totalbytes,returnbytes = 0L;
   PCH            pchEndPath;
   APIRET         rc;
@@ -539 +540 @@
 //      ulExtraBytes = EXTRA_RECORD_BYTES2;
     if((driveflags[toupper(*szDirBase) - 'A'] & DRIVE_REMOTE) && fRemoteBug)
-      ulM = 1L;                         /* file system gets confused */
+      ulM = 1;                          /* file system gets confused */
     else if(driveflags[toupper(*szDirBase) - 'A'] & DRIVE_ZIPSTREAM)
       ulM = min(FilesToGet,225);        /* anything more is wasted */
@@ -554 +555 @@
   ulMaxFiles = ulM;
   pszFileSpec = malloc(CCHMAXPATH + 2);
-  paffbFound = malloc((ulM + 1L) * sizeof(FILEFINDBUF4));
-  papffbSelected = malloc((ulM + 1L) * sizeof(PFILEFINDBUF4));
+  paffbFound = malloc((ulM + 1) * sizeof(FILEFINDBUF4));
+  papffbSelected = malloc((ulM + 1) * sizeof(PFILEFINDBUF4));
   if(paffbFound && papffbSelected && pszFileSpec) {
     t = strlen(szDirBase);
@@ -624 +625 @@
                   numbytes = FillInRecordFromFFB(hwndCnr,pci,pszFileSpec,
                                                  pffbFile,partial,dcd);
-                  if(numbytes > -1L) {
+                  if(numbytes != -1) {
                     pci = (PCNRITEM)pci->rc.preccNextRecord;
                     totalbytes += numbytes;
+                    if (totalbytes == -1)
+                      totalbytes--;             // fixme for real someday
+
                   }
                   else {
@@ -649 +653 @@
                                  CM_INSERTRECORD,
                                  MPFROMP(pciFirst),
-                                 MPFROMP(&ri))) {
+                                 MPFROMP(&ri)))
+                  {
                     DosSleep(100L);
                     WinSetFocus(HWND_DESKTOP,hwndCnr);
@@ -673 +678 @@
                                     __LINE__,
                                     GetPString(IDS_FILLDIRERR2TEXT));
-                      totalbytes = -1L;
+                      totalbytes = -1;
                       if(WinIsWindow((HAB)0,hwndCnr)) {
                         pci = pciFirst;
@@ -695 +700 @@
                               __LINE__,
                               GetPString(IDS_FILLDIRERR3TEXT));
-                totalbytes = -1L;
+                totalbytes = -1;
               }
-              if(totalbytes > -1L) {
+              if(totalbytes != -1) {
                 returnbytes += totalbytes;
+                if (returnbytes == -1)
+                  returnbytes--;        // fixme for real someday
                 if(foundany)
                   (*foundany) += ulMaxFiles;
@@ -760 +767 @@
             numbytes = FillInRecordFromFFB(hwndCnr,pci,pszFileSpec,
                                            pffbFile,partial,dcd);
-            if(numbytes > -1L) {
+            if (numbytes != -1) {
               pci = (PCNRITEM)pci->rc.preccNextRecord;
               totalbytes += numbytes;
+              if (totalbytes == -1)
+                totalbytes--;           // fixme for real someday
             }
             else {
@@ -790 +799 @@
               WinSetFocus(HWND_DESKTOP,hwndCnr);
               if(!WinSendMsg(hwndCnr,CM_INSERTRECORD,
-                             MPFROMP(pciFirst),MPFROMP(&ri))) {
-
+                             MPFROMP(pciFirst),MPFROMP(&ri)))
+              {
                 { // SHL
                   CHAR sz[80];
@@ -808 +817 @@
                               __LINE__,
                               GetPString(IDS_FILLDIRERR5TEXT));
-                totalbytes = -1L;
+                totalbytes = -1;
                 if(WinIsWindow((HAB)0,hwndCnr)) {
                   pci = pciFirst;
@@ -828 +837 @@
                         __LINE__,
                         GetPString(IDS_FILLDIRERR3TEXT));
-          totalbytes = -1L;
-        }
-        if(totalbytes > -1L) {
+          totalbytes = -1;
+        }
+        if(totalbytes != -1) {
           returnbytes += totalbytes;
+          if (returnbytes == -1)
+            returnbytes--;              // fixme for real someday
           if(foundany)
             (*foundany) += ulMaxFiles;
@@ -868 +879 @@
 
 
-ULONG FillDirCnr (HWND hwndCnr,CHAR *directory,DIRCNRDATA *dcd) {
-
+ULONG FillDirCnr (HWND hwndCnr,CHAR *directory,DIRCNRDATA *dcd)
+{
   ULONG ret;
 
@@ -879 +890 @@
 
 
-ULONG FillTreeCnr (HWND hwndCnr,HWND hwndParent) {
-
+ULONG FillTreeCnr (HWND hwndCnr,HWND hwndParent)
+{
   ULONG       ulDriveNum,ulDriveMap,numtoinsert = 0L,drvtype;
   PCNRITEM    pci,pciFirst = NULL,pciNext,pciParent = NULL;
@@ -1422 +1433 @@
   }
   didonce = TRUE;
-  return 0L;
+  return 0;
 }