summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2006-03-12 22:21:05 +0000
committerJim Meyering <jim@meyering.net>2006-03-12 22:21:05 +0000
commitd0c89246d001217064ee93c9f764e9d27e424db5 (patch)
tree005d3555b21e84d8ad6daf3e8d3cdad1c1111567
parent4798c2315206ec1b76bc5a4a18a3d0f63c47466b (diff)
downloadcoreutils-d0c89246d001217064ee93c9f764e9d27e424db5.tar.xz
(AD_pop_and_chdir): Use new macro,
CYCLE_CHECK_REFLECT_CHDIR_UP, rather than open-coding it.
-rw-r--r--src/remove.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/remove.c b/src/remove.c
index cf46fd2c9..bfb8a39b9 100644
--- a/src/remove.c
+++ b/src/remove.c
@@ -411,8 +411,8 @@ AD_pop_and_chdir (DIR **dirp, Dirstack_state *ds, char **prev_dir)
could be reused in the creation (by some other process)
of a directory that this rm process would encounter,
which would result in a false-positive cycle indication. */
- if (SAME_INODE (ds->cycle_check_state.dev_ino, leaf_dev_ino))
- ds->cycle_check_state.dev_ino = top->dev_ino;
+ CYCLE_CHECK_REFLECT_CHDIR_UP (&ds->cycle_check_state,
+ top->dev_ino, leaf_dev_ino);
/* Propagate any failure to parent. */
UPDATE_STATUS (top->status, old_status);