svn commit: r343741 - stable/12/usr.bin/find

[Oleksandr Tymoshenko]

Author: gonzo
Date: Mon Feb  4 10:25:29 2019
New Revision: 343741
URL: https://svnweb.freebsd.org/changeset/base/343741

Log:
  MFC r343516:
  
  Fix whiteout support in find(1)
  
  find(1) ignores -type w passed to it. With this patch find(1) properly
  identifies and prints whiteouts.
  
  PR:		126384, 156703
  Submitted by:	oleg at mamontov.net

Modified:
  stable/12/usr.bin/find/find.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/usr.bin/find/find.c
==============================================================================
--- stable/12/usr.bin/find/find.c	Mon Feb  4 10:24:57 2019	(r343740)
+++ stable/12/usr.bin/find/find.c	Mon Feb  4 10:25:29 2019	(r343741)
@@ -208,8 +208,10 @@ find_execute(PLAN *plan, char *paths[])
 			    entry->fts_path, strerror(entry->fts_errno));
 			exitstatus = 1;
 			continue;
-#ifdef FTS_W
+#if defined(FTS_W) && defined(FTS_WHITEOUT)
 		case FTS_W:
+			if (ftsoptions & FTS_WHITEOUT)
+				break;
 			continue;
 #endif /* FTS_W */
 		}