fts: avoid false-positive cycle-detection

* lib/fts.c (fts_read): Reinitialize cycle-detection data structures
for each new command line argument.

diff --git a/ChangeLog b/ChangeLog
index 56a6bdace584c50bc75f0b4755588fc9864c96f5..9c788528823a3b7cf496c6673da737c325e52e3e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-19  Jim Meyering  <meyering@redhat.com>
+
+       fts: avoid false-positive cycle-detection
+       * lib/fts.c (fts_read): Reinitialize cycle-detection data structures
+       for each new command line argument.
+
 2009-07-19  Bruno Haible  <bruno@clisp.org>
 
        Fix build error on mingw with the modules sys_select and unistd.

diff --git a/lib/fts.c b/lib/fts.c
index 0cbb9fb642bc49dc5203cfd014725a00d113520e..bbcd1ff1f1eb82235606e536c5f1712ab07986b2 100644 (file)
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -932,7 +932,9 @@ next:       tmp = p;
                                SET(FTS_STOP);
                                return (NULL);
                        }
+                       free_dir(sp);
                        fts_load(sp, p);
+                       setup_dir(sp);
                        goto check_for_dir;
                }