diff options
| -rw-r--r-- | include/fts.h | 5 | ||||
| -rw-r--r-- | lib/libc/gen/fts.c | 20 |
2 files changed, 3 insertions, 22 deletions
diff --git a/include/fts.h b/include/fts.h index f325bfb4adb..825fc5abfe8 100644 --- a/include/fts.h +++ b/include/fts.h @@ -1,4 +1,4 @@ -/* $OpenBSD: fts.h,v 1.10 2004/01/22 21:48:02 espie Exp $ */ +/* $OpenBSD: fts.h,v 1.11 2005/06/17 20:36:55 millert Exp $ */ /* $NetBSD: fts.h,v 1.5 1994/12/28 01:41:50 mycroft Exp $ */ /* @@ -53,7 +53,6 @@ typedef struct { #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 0x1000 /* (private) child names only */ @@ -95,12 +94,10 @@ typedef struct _ftsent { #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 */ unsigned 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_ISW 0x04 /* this is a whiteout object */ unsigned short fts_flags; /* private flags for FTSENT structure */ #define FTS_AGAIN 1 /* read node again */ diff --git a/lib/libc/gen/fts.c b/lib/libc/gen/fts.c index dfc634b7bd9..be94a04faaa 100644 --- a/lib/libc/gen/fts.c +++ b/lib/libc/gen/fts.c @@ -1,4 +1,4 @@ -/* $OpenBSD: fts.c,v 1.35 2005/06/16 03:01:25 millert Exp $ */ +/* $OpenBSD: fts.c,v 1.36 2005/06/17 20:36:55 millert Exp $ */ /*- * Copyright (c) 1990, 1993, 1994 @@ -33,7 +33,7 @@ #if 0 static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #else -static char rcsid[] = "$OpenBSD: fts.c,v 1.35 2005/06/16 03:01:25 millert Exp $"; +static char rcsid[] = "$OpenBSD: fts.c,v 1.36 2005/06/17 20:36:55 millert Exp $"; #endif #endif /* LIBC_SCCS and not lint */ @@ -695,11 +695,6 @@ mem1: saved_errno = errno; return (NULL); } -#ifdef FTS_WHITEOUT - if (dp->d_type == DT_WHT) - p->fts_flags |= FTS_ISW; -#endif - if (cderrno) { if (nlinks) { p->fts_info = FTS_NS; @@ -802,17 +797,6 @@ fts_stat(FTS *sp, FTSENT *p, int follow) /* If user needs stat info, stat buffer already allocated. */ sbp = ISSET(FTS_NOSTAT) ? &sb : p->fts_statp; -#ifdef FTS_WHITEOUT - /* check for whiteout */ - if (p->fts_flags & FTS_ISW) { - if (sbp != &sb) { - memset(sbp, '\0', sizeof (*sbp)); - sbp->st_mode = S_IFWHT; - } - return (FTS_W); - } -#endif - /* * If doing a logical walk, or application requested FTS_FOLLOW, do * a stat(2). If that fails, check for a non-existent symlink. If |