bekucera/coreutils
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/coreutils.git synced 2025-09-10 07:59:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

(leave_dir): If cycle-check's saved dev-ino pair matches

Browse Source 
that of the current directory (which we're about to chdir ".." out of),
then save the dev-ino of the parent, instead.
This commit is contained in:
Jim Meyering
2006-03-12 22:03:17 +00:00
parent ac1e215dc2
commit 5ff988ec22
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/fts-cycle.c
View File

@@ -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. */