no more whiteouts

3 files changed, 7 insertions, 29 deletions

diff --git a/usr.bin/find/find.1 b/usr.bin/find/find.1
index 81dfda395d2..09972ad7a66 100644
--- a/usr.bin/find/find.1
+++ b/usr.bin/find/find.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: find.1,v 1.47 2005/03/14 15:29:15 jmc Exp $
+.\"	$OpenBSD: find.1,v 1.48 2005/06/15 14:19:45 millert Exp $
 .\" Copyright (c) 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
 .\"
@@ -39,7 +39,7 @@
 .Nd walk a file hierarchy
 .Sh SYNOPSIS
 .Nm find
-.Op Fl dHhLWXx
+.Op Fl dHhLXx
 .Op Fl f Ar path
 .Ar path ...\&
 .Op Ar expression
@@ -96,10 +96,6 @@ returned for each symbolic link to be those of the file referenced by the
 link, not the link itself.
 If the referenced file does not exist, the file information and type will
 be for the link itself.
-.It Fl W
-Let
-.Nm
-take whiteouts into account when scanning directories.
 .It Fl X
 Permit
 .Nm
@@ -406,9 +402,6 @@ True if the file is of the specified type.
 Possible file types are as follows:
 .Pp
 .Bl -tag -width flag -offset indent -compact
-.It Cm W
-whiteout (currently, these won't even be visible without also specifying
-.Fl W )
 .It Cm b
 block special
 .It Cm c
@@ -646,8 +639,3 @@ option and the
 .Xr getopt 3
 .Dq \-\-
 construct.
-.Pp
-The
-.Fl W
-option is probably not the most elegant way to handle whiteouts.
-It may be replaced by a more sophisticated algorithm eventually.
diff --git a/usr.bin/find/function.c b/usr.bin/find/function.c
index 878c97ff119..5f1dac45386 100644
--- a/usr.bin/find/function.c
+++ b/usr.bin/find/function.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: function.c,v 1.30 2004/07/20 03:50:25 deraadt Exp $	*/
+/*	$OpenBSD: function.c,v 1.31 2005/06/15 14:19:45 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -34,7 +34,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "from: @(#)function.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: function.c,v 1.30 2004/07/20 03:50:25 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: function.c,v 1.31 2005/06/15 14:19:45 millert Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -1276,13 +1276,6 @@ c_type(char *typestring, char ***ignored, int unused)
 	ftsoptions &= ~FTS_NOSTAT;
 
 	switch (typestring[0]) {
-#ifdef S_IFWHT
-	case 'W':
-		mask = S_IFWHT;
-		if ((ftsoptions & FTS_WHITEOUT) == 0)
-			warnx("-type W without -W is a no-op");
-		break;
-#endif
 	case 'b':
 		mask = S_IFBLK;
 		break;
diff --git a/usr.bin/find/main.c b/usr.bin/find/main.c
index 3211ae9989a..21232d8c6f5 100644
--- a/usr.bin/find/main.c
+++ b/usr.bin/find/main.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: main.c,v 1.20 2005/02/07 20:46:52 jaredy Exp $	*/
+/*	$OpenBSD: main.c,v 1.21 2005/06/15 14:19:45 millert Exp $	*/
 
 /*-
  * Copyright (c) 1990, 1993
@@ -31,7 +31,7 @@
 
 #ifndef lint
 /*static char sccsid[] = "@(#)main.c	8.1 (Berkeley) 6/6/93";*/
-static char rcsid[] = "$OpenBSD: main.c,v 1.20 2005/02/07 20:46:52 jaredy Exp $";
+static char rcsid[] = "$OpenBSD: main.c,v 1.21 2005/06/15 14:19:45 millert Exp $";
 #endif /* not lint */
 
 #include <sys/types.h>
@@ -76,7 +76,7 @@ main(int argc, char *argv[])
 	sigaction(SIGINFO, &sa, NULL);
 
 	ftsoptions = FTS_NOSTAT|FTS_PHYSICAL;
-	while ((ch = getopt(argc, argv, "Hdf:hLXxW")) != -1)
+	while ((ch = getopt(argc, argv, "Hdf:hLXx")) != -1)
 		switch(ch) {
 		case 'H':
 			ftsoptions |= FTS_COMFOLLOW;
@@ -99,9 +99,6 @@ main(int argc, char *argv[])
 			ftsoptions &= ~FTS_NOSTAT;
 			ftsoptions |= FTS_XDEV;
 			break;
-		case 'W':
-			ftsoptions |= FTS_WHITEOUT;
-			break;
 		case '?':
 		default:
 			break;