Libc-498.tar.gz

[apple/libc.git] / gen / nftw.c

diff --git a/gen/nftw.c b/gen/nftw.c
index 7cb374620f4befb2ab1abe3cafc9769404a2dfed..fdcb821260ff9952836094f399af98cd47d4771b 100644 (file)
--- a/gen/nftw.c
+++ b/gen/nftw.c
@@ -175,9 +175,13 @@ both_ftw(const char *path,
                case FTS_DC:
 #if __DARWIN_UNIX03
                        /* Unix03 says nftw should break cycles and not return
-                         errors in physical mode (which is definitly what it
+                         errors in non-physical mode (which is definitly what it
                          says ftw can't do) */
                        if (nfn && !(ftwflags & FTW_PHYS)) {
+                               /* 4489297 - when FTW_DEPTH is set, skip
+                                  the link also */
+                               if (postorder)
+                                   continue;
                                fnflag = FTW_D;
                                break;
                        }