X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcycle-check.c;h=a5b6df1e51a1d466dae5d5a51e4d51a87d175842;hb=b5eb8386645bf1bcfafa63c729ff9a86454def87;hp=1c6e17cacddf3ee3c30de32950ee7e796a42879a;hpb=267a39bafd249d7eb9c37df06dc6defcf41cb343;p=gnulib.git

diff --git a/lib/cycle-check.c b/lib/cycle-check.c
index 1c6e17cac..a5b6df1e5 100644
--- a/lib/cycle-check.c
+++ b/lib/cycle-check.c
@@ -1,11 +1,12 @@
 /* help detect directory cycles efficiently
 
-   Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2009 Free Software
+   Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   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
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -13,15 +14,11 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; see the file COPYING.
-   If not, write to the Free Software Foundation,
-   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Jim Meyering */
 
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -33,10 +30,6 @@
 
 #include "cycle-check.h"
 
-#define SAME_INODE(Stat_buf_1, Stat_buf_2) \
-  ((Stat_buf_1).st_ino == (Stat_buf_2).st_ino \
-   && (Stat_buf_1).st_dev == (Stat_buf_2).st_dev)
-
 #define CC_MAGIC 9827862
 
 /* Return true if I is a power of 2, or is zero.  */
@@ -70,7 +63,7 @@ cycle_check (struct cycle_check_state *state, struct stat const *sb)
   /* If the current directory ever happens to be the same
      as the one we last recorded for the cycle detection,
      then it's obviously part of a cycle.  */
-  if (state->chdir_counter && SAME_INODE (*sb, state->dev_ino))
+  if (state->chdir_counter && SAME_INODE (*sb, state->dev_ino) == 1)
     return true;
 
   /* If the number of `descending' chdir calls is a power of two,