summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTodd C. Miller <millert@cvs.openbsd.org>2005-06-17 20:36:56 +0000
committerTodd C. Miller <millert@cvs.openbsd.org>2005-06-17 20:36:56 +0000
commit5e383894b5db4b223fa08b33543e38c39eb82dc9 (patch)
tree79abdd350cfda9c923d564f07f0b42da17908192 /lib
parent3e6fff6102adec477e9394ff70ae2dad27f3b8f3 (diff)
bye bye whiteouts
Diffstat (limited to 'lib')
-rw-r--r--lib/libc/gen/fts.c20
1 files changed, 2 insertions, 18 deletions
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