projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make gc_random work under Windows.
[gnulib.git]
/
lib
/
fts_.h
diff --git
a/lib/fts_.h
b/lib/fts_.h
index
7e6a404
..
82213fc
100644
(file)
--- a/
lib/fts_.h
+++ b/
lib/fts_.h
@@
-1,11
+1,11
@@
/* Traverse a file hierarchy.
/* Traverse a file hierarchy.
- Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2006
, 2007
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,8
+13,7
@@
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; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/*
* Copyright (c) 1989, 1993
/*
* Copyright (c) 1989, 1993
@@
-52,7
+51,6
@@
# ifdef _LIBC
# include <features.h>
# ifdef _LIBC
# include <features.h>
-# define _LGPL_PACKAGE 1
# else
# undef __THROW
# define __THROW
# else
# undef __THROW
# define __THROW
@@
-65,6
+63,7
@@
# include <stddef.h>
# include <sys/types.h>
# include <sys/stat.h>
# include <stddef.h>
# include <sys/types.h>
# include <sys/stat.h>
+# include "i-ring.h"
typedef struct {
struct _ftsent *fts_cur; /* current node */
typedef struct {
struct _ftsent *fts_cur; /* current node */
@@
-141,7
+140,7
@@
typedef struct {
# define FTS_STOP 0x2000 /* (private) unrecoverable error */
int fts_options; /* fts_open options, global flags */
# define FTS_STOP 0x2000 /* (private) unrecoverable error */
int fts_options; /* fts_open options, global flags */
-# if
!_LGPL_PACKAGE
+# if
GNULIB_FTS
union {
/* This data structure is used if FTS_TIGHT_CYCLE_CHECK is
specified. It records the directories between a starting
union {
/* This data structure is used if FTS_TIGHT_CYCLE_CHECK is
specified. It records the directories between a starting
@@
-163,7
+162,12
@@
typedef struct {
but it's not appropriate for programs like du. */
struct cycle_check_state *state;
} fts_cycle;
but it's not appropriate for programs like du. */
struct cycle_check_state *state;
} fts_cycle;
+
# endif
# endif
+ /* A stack of the file descriptors corresponding to the
+ most-recently traversed parent directories.
+ Currently used only in FTS_CWDFD mode. */
+ I_ring fts_fd_ring;
} FTS;
typedef struct _ftsent {
} FTS;
typedef struct _ftsent {