projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced with <unistd.h>.
[gnulib.git]
/
lib
/
fts-cycle.c
diff --git
a/lib/fts-cycle.c
b/lib/fts-cycle.c
index
a0310c2
..
669db58
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.
@@
-21,7
+21,7
@@
#include "cycle-check.h"
#include "hash.h"
#include "cycle-check.h"
#include "hash.h"
-/* Use
these
each of these to map a device/inode pair to an FTSENT. */
+/* Use each of these to map a device/inode pair to an FTSENT. */
struct Active_dir
{
dev_t dev;
struct Active_dir
{
dev_t dev;
@@
-50,7
+50,7
@@
AD_hash (void const *x, size_t table_size)
static bool
setup_dir (FTS *fts)
{
static bool
setup_dir (FTS *fts)
{
- if (fts->fts_options &
FTS_TIGHT_CYCLE_CHECK
)
+ if (fts->fts_options &
(FTS_TIGHT_CYCLE_CHECK | FTS_LOGICAL)
)
{
enum { HT_INITIAL_SIZE = 31 };
fts->fts_cycle.ht = hash_initialize (HT_INITIAL_SIZE, NULL, AD_hash,
{
enum { HT_INITIAL_SIZE = 31 };
fts->fts_cycle.ht = hash_initialize (HT_INITIAL_SIZE, NULL, AD_hash,
@@
-74,7
+74,7
@@
setup_dir (FTS *fts)
static bool
enter_dir (FTS *fts, FTSENT *ent)
{
static bool
enter_dir (FTS *fts, FTSENT *ent)
{
- if (fts->fts_options &
FTS_TIGHT_CYCLE_CHECK
)
+ if (fts->fts_options &
(FTS_TIGHT_CYCLE_CHECK | FTS_LOGICAL)
)
{
struct stat const *st = ent->fts_statp;
struct Active_dir *ad = malloc (sizeof *ad);
{
struct stat const *st = ent->fts_statp;
struct Active_dir *ad = malloc (sizeof *ad);
@@
-125,9
+125,9
@@
enter_dir (FTS *fts, FTSENT *ent)
static void
leave_dir (FTS *fts, FTSENT *ent)
{
static void
leave_dir (FTS *fts, FTSENT *ent)
{
- if (fts->fts_options & FTS_TIGHT_CYCLE_CHECK)
+ 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;
struct Active_dir obj;
void *found;
obj.dev = st->st_dev;
@@
-137,6
+137,13
@@
leave_dir (FTS *fts, FTSENT *ent)
abort ();
free (found);
}
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. */
}
/* Free any memory used for cycle detection. */
@@
-144,7
+151,7
@@
leave_dir (FTS *fts, FTSENT *ent)
static void
free_dir (FTS *sp)
{
static void
free_dir (FTS *sp)
{
- if (sp->fts_options &
FTS_TIGHT_CYCLE_CHECK
)
+ if (sp->fts_options &
(FTS_TIGHT_CYCLE_CHECK | FTS_LOGICAL)
)
{
if (sp->fts_cycle.ht)
hash_free (sp->fts_cycle.ht);
{
if (sp->fts_cycle.ht)
hash_free (sp->fts_cycle.ht);