fts: correct internal computation of nlinks (optimization-related)

* lib/fts.c (fts_build): ISSET(FTS_NOSTAT) has no bearing on
whether the current entry is a directory, so don't test it.

diff --git a/ChangeLog b/ChangeLog
index 39f4533ade1ca1c184cbbbd3268ab9ea91185ee7..1bf44d1419bcf774a6b5999d121baf4c83e24f5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-02-11  Jim Meyering  <meyering@redhat.com>
+
+       fts: correct internal computation of nlinks (optimization-related)
+       * lib/fts.c (fts_build): ISSET(FTS_NOSTAT) has no bearing on
+       whether the current entry is a directory, so don't test it.
+
 2009-02-10  Bruno Haible  <bruno@clisp.org>
 
        Tests for module 'uniwbrk/ulc-wordbreaks'.

diff --git a/lib/fts.c b/lib/fts.c
index 836c179bf868a926a7c21a8b597a3bc0f87a95cf..017ccd5419f58161d83e8680d3219d56ce31a2ff 100644 (file)
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -1286,7 +1286,7 @@ mem1:                             saved_errno = errno;
                           to caller, when possible.  */
                        set_stat_type (p->fts_statp, D_TYPE (dp));
                        fts_set_stat_required(p, !skip_stat);
-                       is_dir = (ISSET(FTS_PHYSICAL) && ISSET(FTS_NOSTAT)
+                       is_dir = (ISSET(FTS_PHYSICAL)
                                  && DT_MUST_BE(dp, DT_DIR));
                } else {
                        p->fts_info = fts_stat(sp, p, false);