diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-03 08:32:46 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2006-07-03 08:32:46 +0000 |
| commit | 79c0a43808d9ca85acd04600149fc1a9b75bd1b9 (patch) | |
| tree | 4f8176f1b188c153bea1e568a0610836ae36ab1a /lib/fts-cycle.c | |
| parent | 8aaff11b82298106fa5ce0ff3d22351d43dd468f (diff) | |
| download | gnulib-79c0a43808d9ca85acd04600149fc1a9b75bd1b9.tar.gz | |
Merge from coreutils.
Diffstat (limited to 'lib/fts-cycle.c')
| -rw-r--r-- | lib/fts-cycle.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/lib/fts-cycle.c b/lib/fts-cycle.c index 13b43dbdd1..19c5ded4c3 100644 --- a/lib/fts-cycle.c +++ b/lib/fts-cycle.c @@ -1,6 +1,6 @@ /* 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. @@ -129,9 +129,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 +141,13 @@ leave_dir (FTS *fts, FTSENT *ent) abort (); free (found); } + else + { + FTSENT *parent = ent->fts_parent; + if (parent != NULL) + CYCLE_CHECK_REFLECT_CHDIR_UP (fts->fts_cycle.state, + *(parent->fts_statp), *st); + } } /* Free any memory used for cycle detection. */ |