Changeset 517 for trunk/dll/comp.c

Timestamp:

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

Author:

root

Message:

Correct . and .. detect

File:

• trunk/dll/comp.c (modified) (3 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);