svn commit: r343516 - head/usr.bin/find

Oleksandr Tymoshenko gonzo at FreeBSD.org
Mon Jan 28 02:00:40 UTC 2019


Author: gonzo
Date: Mon Jan 28 02:00:39 2019
New Revision: 343516
URL: https://svnweb.freebsd.org/changeset/base/343516

Log:
  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
  MFC after:	1 week

Modified:
  head/usr.bin/find/find.c

Modified: head/usr.bin/find/find.c
==============================================================================
--- head/usr.bin/find/find.c	Mon Jan 28 01:50:47 2019	(r343515)
+++ head/usr.bin/find/find.c	Mon Jan 28 02:00:39 2019	(r343516)
@@ -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 */
 		}


More information about the svn-src-head mailing list