projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright years: This file was modified in 2005.
[gnulib.git]
/
lib
/
fts-cycle.c
diff --git
a/lib/fts-cycle.c
b/lib/fts-cycle.c
index
13b43db
..
19c5ded
100644
(file)
--- a/
lib/fts-cycle.c
+++ b/
lib/fts-cycle.c
@@
-1,6
+1,6
@@
/* Detect cycles in file tree walks.
/* 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.
Written by Jim Meyering.
@@
-129,9
+129,9
@@
enter_dir (FTS *fts, FTSENT *ent)
static void
leave_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))
{
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;
struct Active_dir obj;
void *found;
obj.dev = st->st_dev;
@@
-141,6
+141,13
@@
leave_dir (FTS *fts, FTSENT *ent)
abort ();
free (found);
}
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. */
}
/* Free any memory used for cycle detection. */