Fix a bug in yesterday's change.

* lib/fts.c (fts_open): When using FTS_XDEV|FTS_NOSTAT,
p->fts_statp->st_dev would be used uninitialized.
Ensures that we always call fts_stat on the very first entry.
Miklos Szeredi reported that find -xdev stopped working.

diff --git a/ChangeLog b/ChangeLog
index f0201b3ffbe2fa50333ef5b95d1426b86ec3792b..561bfdb8b21332a32a13f6cfb742f0c2efc377e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-10-13  Jim Meyering  <jim@meyering.net>
+
+       Fix a bug in yesterday's change.
+       * lib/fts.c (fts_open): When using FTS_XDEV|FTS_NOSTAT,
+       p->fts_statp->st_dev would be used uninitialized.
+       Ensures that we always call fts_stat on the very first entry.
+       Miklos Szeredi reported that find -xdev stopped working.
+
 2006-10-12  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (func_get_automake_snippet): Append an automatically

diff --git a/lib/fts.c b/lib/fts.c
index 05cd67c498c64912a4d2fac3fa8b9427c22d80db..fc6bbd37b72293c75bebc828380b81f5cf044744 100644 (file)
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -396,7 +396,10 @@ fts_open (char * const *argv,
                p->fts_level = FTS_ROOTLEVEL;
                p->fts_parent = parent;
                p->fts_accpath = p->fts_name;
-               if (defer_stat) {
+               /* Even when defer_stat is true, be sure to stat the first
+                  command line argument, since fts_read (at least with
+                  FTS_XDEV) requires that.  */
+               if (defer_stat && root != NULL) {
                        p->fts_info = FTS_NSOK;
                        fts_set_stat_required(p, true);
                } else {