From owner-svn-src-stable-8@FreeBSD.ORG  Tue Dec 28 02:25:32 2010
Return-Path: <owner-svn-src-stable-8@FreeBSD.ORG>
Delivered-To: svn-src-stable-8@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9B19F1065672;
	Tue, 28 Dec 2010 02:25:32 +0000 (UTC)
	(envelope-from kevlo@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 899158FC12;
	Tue, 28 Dec 2010 02:25:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oBS2PWq7043585;
	Tue, 28 Dec 2010 02:25:32 GMT (envelope-from kevlo@svn.freebsd.org)
Received: (from kevlo@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oBS2PWJo043583;
	Tue, 28 Dec 2010 02:25:32 GMT (envelope-from kevlo@svn.freebsd.org)
Message-Id: <201012280225.oBS2PWJo043583@svn.freebsd.org>
From: Kevin Lo <kevlo@FreeBSD.org>
Date: Tue, 28 Dec 2010 02:25:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r216750 - stable/8/usr.bin/find
X-BeenThere: svn-src-stable-8@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 8-stable src tree
	<svn-src-stable-8.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-8>
List-Post: <mailto:svn-src-stable-8@freebsd.org>
List-Help: <mailto:svn-src-stable-8-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-8>, 
	<mailto:svn-src-stable-8-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 28 Dec 2010 02:25:32 -0000

Author: kevlo
Date: Tue Dec 28 02:25:32 2010
New Revision: 216750
URL: http://svn.freebsd.org/changeset/base/216750

Log:
  MFC r216106:
  Don't error out while searching for empty directories.
  
  Submitted by:	Bakul Shah <bakul at bitblocks dot com>

Modified:
  stable/8/usr.bin/find/function.c

Modified: stable/8/usr.bin/find/function.c
==============================================================================
--- stable/8/usr.bin/find/function.c	Tue Dec 28 01:38:52 2010	(r216749)
+++ stable/8/usr.bin/find/function.c	Tue Dec 28 02:25:32 2010	(r216750)
@@ -560,7 +560,7 @@ f_empty(PLAN *plan __unused, FTSENT *ent
 		empty = 1;
 		dir = opendir(entry->fts_accpath);
 		if (dir == NULL)
-			err(1, "%s", entry->fts_accpath);
+			return 0;
 		for (dp = readdir(dir); dp; dp = readdir(dir))
 			if (dp->d_name[0] != '.' ||
 			    (dp->d_name[1] != '\0' &&