projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
qacl: port to Windows better
[gnulib.git]
/
lib
/
cycle-check.c
diff --git
a/lib/cycle-check.c
b/lib/cycle-check.c
index
d8a3ca0
..
d475225
100644
(file)
--- a/
lib/cycle-check.c
+++ b/
lib/cycle-check.c
@@
-1,11
+1,11
@@
/* help detect directory cycles efficiently
/* help detect directory cycles efficiently
- Copyright (C) 2003
, 2004, 2005, 2006
Free Software Foundation, Inc.
+ Copyright (C) 2003
-2006, 2009-2013
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
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
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,15
+13,11
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
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 */
/* Written by Jim Meyering */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/stat.h>
@@
-37,7
+33,7
@@
/* Return true if I is a power of 2, or is zero. */
/* Return true if I is a power of 2, or is zero. */
-static
inline
bool
+static bool
is_zero_or_power_of_two (uintmax_t i)
{
return (i & (i - 1)) == 0;
is_zero_or_power_of_two (uintmax_t i)
{
return (i & (i - 1)) == 0;
@@
-54,7
+50,7
@@
cycle_check_init (struct cycle_check_state *state)
descending chdir call, with SB corresponding to the chdir operand.
If SB corresponds to a directory that has already been seen,
return true to indicate that there is a directory cycle.
descending chdir call, with SB corresponding to the chdir operand.
If SB corresponds to a directory that has already been seen,
return true to indicate that there is a directory cycle.
- Note that this is done
`lazily'
, which means that some of
+ Note that this is done
"lazily"
, which means that some of
the directories in the cycle may be processed twice before
the cycle is detected. */
the directories in the cycle may be processed twice before
the cycle is detected. */
@@
-69,17
+65,17
@@
cycle_check (struct cycle_check_state *state, struct stat const *sb)
if (state->chdir_counter && SAME_INODE (*sb, state->dev_ino))
return true;
if (state->chdir_counter && SAME_INODE (*sb, state->dev_ino))
return true;
- /* If the number of
`descending'
chdir calls is a power of two,
+ /* If the number of
"descending"
chdir calls is a power of two,
record the dev/ino of the current directory. */
if (is_zero_or_power_of_two (++(state->chdir_counter)))
{
/* On all architectures that we know about, if the counter
record the dev/ino of the current directory. */
if (is_zero_or_power_of_two (++(state->chdir_counter)))
{
/* On all architectures that we know about, if the counter
- overflows then there is a directory cycle here somewhere,
- even if we haven't detected it yet. Typically this happens
- only after the counter is incremented 2**64 times, so it's a
- fairly theoretical point. */
+
overflows then there is a directory cycle here somewhere,
+
even if we haven't detected it yet. Typically this happens
+
only after the counter is incremented 2**64 times, so it's a
+
fairly theoretical point. */
if (state->chdir_counter == 0)
if (state->chdir_counter == 0)
- return true;
+
return true;
state->dev_ino.st_dev = sb->st_dev;
state->dev_ino.st_ino = sb->st_ino;
state->dev_ino.st_dev = sb->st_dev;
state->dev_ino.st_ino = sb->st_ino;