X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Ffts-cycle.c;h=5f81610a359fdd1a50f0ab0b1372496a593e5381;hb=d5ac73d5b20cff8aacc9a1bce8f558415a71b9e1;hp=13b43dbdd13c97f2dd5fa23f0883702a432dae98;hpb=9db27e416179e3b92ae18be230250d08ae6190f5;p=gnulib.git

diff --git a/lib/fts-cycle.c b/lib/fts-cycle.c
index 13b43dbdd..5f81610a3 100644
--- a/lib/fts-cycle.c
+++ b/lib/fts-cycle.c
@@ -1,13 +1,13 @@
 /* Detect cycles in file tree walks.
 
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
    Written by Jim Meyering.
 
-   This program is free software; you can redistribute it and/or modify
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -15,12 +15,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "cycle-check.h"
 #include "hash.h"
@@ -129,9 +124,9 @@ enter_dir (FTS *fts, FTSENT *ent)
 static void
 leave_dir (FTS *fts, FTSENT *ent)
 {
+  struct stat const *st = ent->fts_statp;
   if (fts->fts_options & (FTS_TIGHT_CYCLE_CHECK | FTS_LOGICAL))
     {
-      struct stat const *st = ent->fts_statp;
       struct Active_dir obj;
       void *found;
       obj.dev = st->st_dev;
@@ -141,6 +136,13 @@ leave_dir (FTS *fts, FTSENT *ent)
 	abort ();
       free (found);
     }
+  else
+    {
+      FTSENT *parent = ent->fts_parent;
+      if (parent != NULL && 0 <= parent->fts_level)
+	CYCLE_CHECK_REFLECT_CHDIR_UP (fts->fts_cycle.state,
+				      *(parent->fts_statp), *st);
+    }
 }
 
 /* Free any memory used for cycle detection.  */