From: Jim Meyering <jim@meyering.net>
Date: Sun, 12 Mar 2006 22:01:29 +0000 (+0000)
Subject: Include "same-inode.h".
X-Git-Tag: COREUTILS-6_0~613
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fa44d25fdb61515d3511583e13b94b56ea13e3ed;p=platform%2Fupstream%2Fcoreutils.git

Include "same-inode.h".
(CYCLE_CHECK_REFLECT_CHDIR_UP): Define.
---

diff --git a/lib/cycle-check.h b/lib/cycle-check.h
index 0551bf2..b137a60 100644
--- a/lib/cycle-check.h
+++ b/lib/cycle-check.h
@@ -1,6 +1,6 @@
 /* help detect directory cycles efficiently
 
-   Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -30,6 +30,7 @@
 # endif
 # include <stdbool.h>
 # include "dev-ino.h"
+# include "same-inode.h"
 
 struct cycle_check_state
 {
@@ -41,4 +42,15 @@ struct cycle_check_state
 void cycle_check_init (struct cycle_check_state *state);
 bool cycle_check (struct cycle_check_state *state, struct stat const *sb);
 
+# define CYCLE_CHECK_REFLECT_CHDIR_UP(State, SB_dir, SB_subdir)	\
+  do								\
+    {								\
+      if (SAME_INODE ((State)->dev_ino, SB_subdir))		\
+	{							\
+	  (State)->dev_ino.st_dev = (SB_dir).st_dev;		\
+	  (State)->dev_ino.st_ino = (SB_dir).st_ino;		\
+	}							\
+    }								\
+  while (0)
+
 #endif