Changeset 517

Timestamp:

Nov 2, 2006, 9:51:38 AM (19 years ago)

Author:

root

Message:

Correct . and .. detect

Location:

trunk/dll

Files:

• comp.c (modified) (3 diffs)
• dirsize.c (modified) (2 diffs)
• grep.c (modified) (2 diffs)
• objcnr.c (modified) (2 diffs)
• seeall.c (modified) (2 diffs)

trunk/dll/comp.c

@@ -21 +21 @@
   29 Jul 06 SHL Use xfgets_bstripcr
   15 Aug 06 SHL Turn off hide not selected on dir change
+  19 Oct 06 SHL Correct . and .. detect
 
 ***********************************************************************/
@@ -99 +100 @@
                     fb->attrFile,
                     (fb->cbList > 4L) ? (fb->cbList / 2L) : 0L);
-          else if(recurse && (*fb->achName != '.' ||
-                  (fb->achName[1] && fb->achName[1] != '.')))
+          // Skip . and ..
+          else if (recurse &&
+                   (fb->achName[0] != '.' ||
+                    (fb->achName[1] &&
+                     (fb->achName[1] != '.' || fb->achName[2])))) {
             SnapShot(mask,fp,recurse);
+          }
           nm = 1L;
         } while(!DosFindNext(hdir,fb,sizeof(FILEFINDBUF4),&nm));
@@ -688 +693 @@
         pffb = (FILEFINDBUF4 *)fb;
         if(pffb->attrFile & FILE_DIRECTORY) {
-          if(recurse && (*pffb->achName != '.' && (pffb->achName[1] &&
-             pffb->achName[1] != '.'))) {
+          // Skip . and ..
+          if (recurse &&
+              (pffb->achName[0] != '.' ||
+               (pffb->achName[1] &&
+                (pffb->achName[1] != '.' || pffb->achName[2])))) {
             if(fForceUpper)
               strupr(pffb->achName);

trunk/dll/dirsize.c

@@ -21 +21 @@
   08 Aug 05 SHL Avoid Expand/Collapse hangs while working
   17 Jul 06 SHL Use Runtime_Error
+  19 Oct 06 SHL Correct . and .. detect
 
 ***********************************************************************/
@@ -225 +226 @@
         //fflush(stdout);
         // Total size skipping . and ..
-        if((*pffbFile->achName != '.' ||
-           (pffbFile->achName[1] && pffbFile->achName[1] != '.')) ||
-           !(pffbFile->attrFile & FILE_DIRECTORY))
-        {
+        if ((~pffbFile->attrFile & FILE_DIRECTORY) ||
+            (pffbFile->achName[0] != '.' ||
+             (pffbFile->achName[1] &&
+              (pffbFile->achName[1] != '.' || pffbFile->achName[2])))) {
           ullCurDirBytes += pffbFile->cbFile;
           ullCurDirBytes += CBLIST_TO_EASIZE(pffbFile->cbList) & 0x3ff;

trunk/dll/grep.c

@@ -17 +17 @@
   22 Jul 06 SHL Use Runtime_Error
   26 Jul 06 SHL Check more run time errors
+  19 Oct 06 SHL Correct . and .. detect
 
 ***********************************************************************/
@@ -443 +444 @@
       if(*grep->stopflag)
         break;
-      if(*findBuffer.achName != '.' ||
-         (findBuffer.achName[1] && findBuffer.achName[1] != '.')) {
+      // Skip . and ..
+      if (findBuffer.achName[0] != '.' ||
+          (findBuffer.achName[1] &&
+           (findBuffer.achName[1] != '.' || findBuffer.achName[2]))) {
         strcpy(p,findBuffer.achName) ;
         if(!grep->anyexcludes || !IsExcluded(searchPath,fle,numfls)) {

trunk/dll/objcnr.c

@@ -12 +12 @@
   13 Jul 06 SHL Use Runtime_Error
   01 Sep 06 SHL Do not complain for normal cancel
+  19 Oct 06 SHL Correct . and .. detect
 
 ***********************************************************************/
@@ -172 +173 @@
         if(*stopflag)
           break;
-        if((pffbFile->attrFile & FILE_DIRECTORY) &&
-           (*pffbFile->achName != '.' || (pffbFile->achName[1] &&
-            pffbFile->achName[1] != '.'))) {
+        if ((pffbFile->attrFile & FILE_DIRECTORY) &&
+            // Skip . and ..
+            (pffbFile->achName[0] != '.' ||
+             (pffbFile->achName[1] &&
+              (pffbFile->achName[1] != '.' || pffbFile->achName[2])))) {
           strcpy(endpath,pffbFile->achName);
           ProcessDir(hwndCnr,maskstr,pciP,stopflag);

trunk/dll/seeall.c

@@ -18 +18 @@
   29 May 06 SHL Comments
   17 Jul 06 SHL Use Runtime_Error
+  19 Oct 06 SHL Correct . and .. detect
 
 ***********************************************************************/
@@ -2061 +2062 @@
       for(x = 0;x < nm;x++) {
         ffb = (FILEFINDBUF3 *)fb;
-        if(ffb->attrFile & FILE_DIRECTORY) {
-          if(*ffb->achName != '.' ||
-             (ffb->achName[1] &&
-              ffb->achName[1] != '.')) {
+        if (ffb->attrFile & FILE_DIRECTORY) {
+          // Skip . and ..
+          if (ffb->achName[0] != '.' ||
+              (ffb->achName[1] &&
+               (ffb->achName[1] != '.' || ffb->achName[2]))) {
             strcpy(enddir,ffb->achName);
             DoADir(hwnd,filename);