diff options
| author | Jim Meyering <jim@meyering.net> | 2006-03-12 22:03:17 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 2006-03-12 22:03:17 +0000 |
| commit | 5ff988ec220da5487d4f0f232cf86fa1be87ffb6 (patch) | |
| tree | f17b29220b2b0696c991511e2ec90f136c36bd93 | |
| parent | ac1e215dc2d49a6de98754b0373d129efcb562cb (diff) | |
| download | coreutils-5ff988ec220da5487d4f0f232cf86fa1be87ffb6.tar.xz | |
(leave_dir): If cycle-check's saved dev-ino pair matches
that of the current directory (which we're about to chdir ".." out of),
then save the dev-ino of the parent, instead.
| -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 13b43dbdd..19c5ded4c 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. */ |