virgin copy from glibc

1 files changed, 45 insertions, 41 deletions

diff --git a/lib/fts_.h b/lib/fts_.h
index 03f621bf6..a22c7bb9c 100644
--- a/lib/fts_.h
+++ b/lib/fts_.h
@@ -30,10 +30,17 @@
  */
 
 #ifndef	_FTS_H
-# define _FTS_H 1
+#define	_FTS_H 1
+
+#include <features.h>
+#include <sys/types.h>
+
+/* The fts interface is incompatible with the LFS interface which
+   transparently uses the 64-bit file access functions.  */
+#ifdef __USE_FILE_OFFSET64
+# error "<fts.h> cannot be used with -D_FILE_OFFSET_BITS==64"
+#endif
 
-# include <features.h>
-# include <sys/types.h>
 
 typedef struct {
 	struct _ftsent *fts_cur;	/* current node */
@@ -46,22 +53,19 @@ typedef struct {
 	int fts_nitems;			/* elements in the sort array */
 	int (*fts_compar) (const void *, const void *); /* compare fn */
 
-# define FTS_COMFOLLOW	0x0001		/* follow command line symlinks */
-# define FTS_LOGICAL	0x0002		/* logical walk */
-# define FTS_NOCHDIR	0x0004		/* don't change directories */
-# define FTS_NOSTAT	0x0008		/* don't get stat info */
-# define FTS_PHYSICAL	0x0010		/* physical walk */
-# define FTS_SEEDOT	0x0020		/* return dot and dot-dot */
-# define FTS_XDEV	0x0040		/* don't cross devices */
-# define FTS_WHITEOUT	0x0080		/* return whiteout information */
-# define FTS_OPTIONMASK	0x00ff		/* valid user option mask */
-
-# define FTS_NAMEONLY	0x0100		/* (private) child names only */
-# define FTS_STOP	0x0200		/* (private) unrecoverable error */
+#define	FTS_COMFOLLOW	0x0001		/* follow command line symlinks */
+#define	FTS_LOGICAL	0x0002		/* logical walk */
+#define	FTS_NOCHDIR	0x0004		/* don't change directories */
+#define	FTS_NOSTAT	0x0008		/* don't get stat info */
+#define	FTS_PHYSICAL	0x0010		/* physical walk */
+#define	FTS_SEEDOT	0x0020		/* return dot and dot-dot */
+#define	FTS_XDEV	0x0040		/* don't cross devices */
+#define FTS_WHITEOUT	0x0080		/* return whiteout information */
+#define	FTS_OPTIONMASK	0x00ff		/* valid user option mask */
+
+#define	FTS_NAMEONLY	0x0100		/* (private) child names only */
+#define	FTS_STOP	0x0200		/* (private) unrecoverable error */
 	int fts_options;		/* fts_open options, global flags */
-	/* Data structure in which to store the fingerprint
-	   of each directory we've encountered.  */
-	void *fts_dir_info;
 } FTS;
 
 typedef struct _ftsent {
@@ -74,41 +78,41 @@ typedef struct _ftsent {
 	char *fts_path;			/* root path */
 	int fts_errno;			/* errno for this node */
 	int fts_symfd;			/* fd for symlink */
-	size_t fts_pathlen;		/* strlen(fts_path) */
+	u_short fts_pathlen;		/* strlen(fts_path) */
 	u_short fts_namelen;		/* strlen(fts_name) */
 
 	ino_t fts_ino;			/* inode */
 	dev_t fts_dev;			/* device */
 	nlink_t fts_nlink;		/* link count */
 
-# define FTS_ROOTPARENTLEVEL	-1
-# define FTS_ROOTLEVEL		 0
+#define	FTS_ROOTPARENTLEVEL	-1
+#define	FTS_ROOTLEVEL		 0
 	short fts_level;		/* depth (-1 to N) */
 
-# define FTS_D		 1		/* preorder directory */
-# define FTS_DC		 2		/* directory that causes cycles */
-# define FTS_DEFAULT	 3		/* none of the above */
-# define FTS_DNR		 4		/* unreadable directory */
-# define FTS_DOT		 5		/* dot or dot-dot */
-# define FTS_DP		 6		/* postorder directory */
-# define FTS_ERR		 7		/* error; errno is set */
-# define FTS_F		 8		/* regular file */
-# define FTS_INIT	 9		/* initialized only */
-# define FTS_NS		10		/* stat(2) failed */
-# define FTS_NSOK	11		/* no stat(2) requested */
-# define FTS_SL		12		/* symbolic link */
-# define FTS_SLNONE	13		/* symbolic link without target */
-# define FTS_W		14		/* whiteout object */
+#define	FTS_D		 1		/* preorder directory */
+#define	FTS_DC		 2		/* directory that causes cycles */
+#define	FTS_DEFAULT	 3		/* none of the above */
+#define	FTS_DNR		 4		/* unreadable directory */
+#define	FTS_DOT		 5		/* dot or dot-dot */
+#define	FTS_DP		 6		/* postorder directory */
+#define	FTS_ERR		 7		/* error; errno is set */
+#define	FTS_F		 8		/* regular file */
+#define	FTS_INIT	 9		/* initialized only */
+#define	FTS_NS		10		/* stat(2) failed */
+#define	FTS_NSOK	11		/* no stat(2) requested */
+#define	FTS_SL		12		/* symbolic link */
+#define	FTS_SLNONE	13		/* symbolic link without target */
+#define FTS_W		14		/* whiteout object */
 	u_short fts_info;		/* user flags for FTSENT structure */
 
-# define FTS_DONTCHDIR	 0x01		/* don't chdir .. to the parent */
-# define FTS_SYMFOLLOW	 0x02		/* followed a symlink to get here */
+#define	FTS_DONTCHDIR	 0x01		/* don't chdir .. to the parent */
+#define	FTS_SYMFOLLOW	 0x02		/* followed a symlink to get here */
 	u_short fts_flags;		/* private flags for FTSENT structure */
 
-# define FTS_AGAIN	 1		/* read node again */
-# define FTS_FOLLOW	 2		/* follow symbolic link */
-# define FTS_NOINSTR	 3		/* no instructions */
-# define FTS_SKIP	 4		/* discard node */
+#define	FTS_AGAIN	 1		/* read node again */
+#define	FTS_FOLLOW	 2		/* follow symbolic link */
+#define	FTS_NOINSTR	 3		/* no instructions */
+#define	FTS_SKIP	 4		/* discard node */
 	u_short fts_instr;		/* fts_set() instructions */
 
 	struct stat *fts_statp;		/* stat(2) information */