summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--src/remove.c22
2 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 183a8d155..96391a393 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-07-03 Jim Meyering <jim@meyering.net>
+ The dev/inode of the topmost directory in each hierarchy were not
+ being recorded.
+ * src/remove.c (remove_cwd_entries): Don't call cycle_check here.
+ (AD_push): Call it from here instead.
+
Fix two small leaks.
* src/remove.c (AD_stack_clear): New function.
(rm_1): Use it.
diff --git a/src/remove.c b/src/remove.c
index bc0b92b7b..f85372bb1 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -590,6 +590,17 @@ AD_push (int fd_cwd, Dirstack_state *ds, char const *dir,
}
}
+ if (cycle_check (&ds->cycle_check_state, dir_sb_from_parent))
+ {
+ error (0, 0, _("\
+WARNING: Circular directory structure.\n\
+This almost certainly means that you have a corrupted file system.\n\
+NOTIFY YOUR SYSTEM MANAGER.\n\
+The following directory is part of the cycle:\n %s\n"),
+ quote (full_filename (".")));
+ longjmp (ds->current_arg_jumpbuf, 1);
+ }
+
/* Extend the stack. */
obstack_blank (&ds->Active_dir, sizeof (struct AD_ent));
@@ -1160,17 +1171,6 @@ remove_cwd_entries (DIR **dirp,
break;
}
- if (cycle_check (&ds->cycle_check_state, subdir_sb))
- {
- error (0, 0, _("\
-WARNING: Circular directory structure.\n\
-This almost certainly means that you have a corrupted file system.\n\
-NOTIFY YOUR SYSTEM MANAGER.\n\
-The following directory is part of the cycle:\n %s\n"),
- quote (full_filename (".")));
- longjmp (ds->current_arg_jumpbuf, 1);
- }
-
*subdir = xstrdup (f);
if (closedir (*dirp) != 0)
{