Changeset 515 for trunk/dll

Timestamp:

Nov 2, 2006, 9:49:07 AM (19 years ago)

Author:

root

Message:

Stubby - correct . and .. detect

File:

• trunk/dll/flesh.c (modified) (3 diffs)

trunk/dll/flesh.c

@@ -14 +14 @@
   24 Oct 05 SHL Delete obsolete code
   22 Jul 06 SHL Check more run time errors
+  19 Oct 06 SHL Stubby - correct . and .. detect
 
 ***********************************************************************/
@@ -369 +370 @@
         }
       }
-      if(*pffb->achName &&
-         (includefiles || (pffb->attrFile & FILE_DIRECTORY)) &&
-         (*pffb->achName != '.' || (pffb->achName[1] &&
-          pffb->achName[1] != '.'))) {
+      if (*pffb->achName &&
+          (includefiles || (pffb->attrFile & FILE_DIRECTORY)) &&
+          // Skip . and ..
+          (pffb->achName[0] != '.' ||
+           (pffb->achName[1] &&
+            (pffb->achName[1] != '.' || pffb->achName[2])))) {
         DosFindClose(hDir);
         isadir = TRUE;
@@ -450 +453 @@
           }
         }
-        if(*pffb->achName &&
-           (includefiles || (pffb->attrFile & FILE_DIRECTORY)) &&
-           (*pffb->achName != '.' || (pffb->achName[1] &&
-            pffb->achName[1] != '.'))) {
+        if (*pffb->achName &&
+            (includefiles || (pffb->attrFile & FILE_DIRECTORY)) &&
+            // Skip . and ..
+            (pffb->achName[0] != '.' ||
+             (pffb->achName[1] && (pffb->achName[1] != '.' || pffb->achName[2])))) {
           isadir = TRUE;
           break;