Changeset 54 for trunk/dll/dirsize.c

Timestamp:

Apr 18, 2003, 5:03:24 AM (22 years ago)

Author:

root

Message:

Use CBLIST_TO_EASIZE

File:

• trunk/dll/dirsize.c (modified) (10 diffs)

trunk/dll/dirsize.c

@@ -60 +60 @@
                          CHAR *stopflag,BOOL top)
 {
-  CHAR           maskstr[CCHMAXPATH],*endpath;
+  CHAR           maskstr[CCHMAXPATH],*pEndMask;
   register char *p,*sp,*pp;
   ULONG          nm,totalbytes = 0L,subbytes = 0L,temp;
@@ -75 +75 @@
   if(maskstr[strlen(maskstr) - 1] != '\\')
     strcat(maskstr,"\\");
-  endpath = &maskstr[strlen(maskstr)];
+  pEndMask = &maskstr[strlen(maskstr)]; // Point after last \
   strcat(maskstr,"*");
 //printf("%s\n",maskstr);
@@ -95 +95 @@
    * requesting EASIZE.  sheesh.
    */
-  if((!rc && (ffb->attrFile & FILE_DIRECTORY)) || strlen(filename) < 4) {
+  if((!rc && (ffb->attrFile & FILE_DIRECTORY)) || strlen(filename) < 4)
+  {
     if(*stopflag) {
       free(ffb);
@@ -116 +117 @@
     pciP->attrFile = 0L;
   }
-  else {
+  else
+  {
     free(ffb);
     Dos_Error(MB_ENTER,
@@ -168 +170 @@
   }
   hdir = HDIR_CREATE;
-  nm = /* FilesToGet; */ 1L;
+  nm = 1L;
 //printf("FIND2\n");
   rc = DosFindFirst(maskstr,&hdir,
                     FILE_NORMAL | FILE_READONLY | FILE_ARCHIVED |
-                    FILE_SYSTEM | FILE_HIDDEN | FILE_DIRECTORY,ffb,
-                    sizeof(FILEFINDBUF4) /* * FilesToGet */,
-                    &nm,FIL_QUERYEASIZE);
-  if(!rc) {
-
+                    FILE_SYSTEM | FILE_HIDDEN | FILE_DIRECTORY,
+                    ffb,
+                    sizeof(FILEFINDBUF4),
+                    &nm,
+                    FIL_QUERYEASIZE);
+  if(!rc)
+  {
     register PBYTE fb = (PBYTE)ffb;
     FILEFINDBUF4  *pffbFile;
     ULONG          x;
 
-    while(!rc) {
+    while(!rc)
+    {
       priority_normal();
       //printf("Found %lu\n",nm);
-      for(x = 0L;x < nm;x++) {
+      for(x = 0L;x < nm;x++)
+      {
         pffbFile = (FILEFINDBUF4 *)fb;
         //printf("%s\n",pffbFile->achName);
         //fflush(stdout);
-        if((*pffbFile->achName != '.' || (pffbFile->achName[1] &&
-           pffbFile->achName[1] != '.')) ||
-           !(pffbFile->attrFile & FILE_DIRECTORY)) {
+        // Total size skipping . and ..
+        if((*pffbFile->achName != '.' ||
+           (pffbFile->achName[1] && pffbFile->achName[1] != '.')) ||
+           !(pffbFile->attrFile & FILE_DIRECTORY))
+        {
             totalbytes += pffbFile->cbFile +
                           CBLIST_TO_EASIZE(pffbFile->cbList);
           if(!(pffbFile->attrFile & FILE_DIRECTORY))
-            pciP->attrFile++;
+            pciP->attrFile++;           // Bump file count
           if(*stopflag)
             break;
           if(pffbFile->attrFile & FILE_DIRECTORY) {
-            strcpy(endpath,pffbFile->achName);
+            // Recurse into subdir
+            strcpy(pEndMask,pffbFile->achName); // Append dirname to base dirname
             if(!*stopflag)
+            {
               temp = ProcessDir(hwndCnr,maskstr,pciP,stopflag,FALSE);
-            if(temp != (ULONG)-1L)
-              subbytes += temp;
+              if(temp != (ULONG)-1L)
+                subbytes += temp;
+            }
           }
         }
@@ -208 +219 @@
           break;
         fb += pffbFile->oNextEntryOffset;
-      }
+      } // for matches
       if(*stopflag)
         break;
       DosSleep(0L);
-      nm = /* FilesToGet; */ 1L;
-      rc = DosFindNext(hdir,ffb,sizeof(FILEFINDBUF4) /* * FilesToGet */,&nm);
-    }
+      nm = 1L;  /* FilesToGet */ 
+      rc = DosFindNext(hdir,ffb,sizeof(FILEFINDBUF4) ,&nm);
+    } // while more found
     DosFindClose(hdir);
     priority_normal();
@@ -228 +239 @@
 
 VOID FillInRecSizes (HWND hwndCnr,PCNRITEM pciParent,ULONG totalbytes,
-                     CHAR *stopflag,BOOL isroot) {
-
+                     CHAR *stopflag,BOOL isroot)
+{
   PCNRITEM pci = pciParent;
   SHORT    attrib = CMA_FIRSTCHILD;
@@ -348 +359 @@
 
 
-static VOID FillCnrs (VOID *args) {
-
+static VOID FillCnrs (VOID *args)
+{
   HAB           hab;
   HMQ           hmq;
@@ -362 +373 @@
   DosError(FERR_DISABLEHARDERR);
 
-//  priority_normal();
+  // priority_normal();
   hab = WinInitialize(0);
   if(hab) {
@@ -387 +398 @@
 
 
-MRESULT EXPENTRY DirSizeProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
-
+MRESULT EXPENTRY DirSizeProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2)
+{
   TEMP *data;