From owner-svn-src-head@FreeBSD.ORG  Sun Mar 16 14:42:58 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DCE20B2E;
 Sun, 16 Mar 2014 14:42:58 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id C9463F5C;
 Sun, 16 Mar 2014 14:42:58 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2GEgwcw008962;
 Sun, 16 Mar 2014 14:42:58 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2GEgwUT008961;
 Sun, 16 Mar 2014 14:42:58 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201403161442.s2GEgwUT008961@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sun, 16 Mar 2014 14:42:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r263244 - head/usr.bin/find
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 16 Mar 2014 14:42:58 -0000

Author: jilles
Date: Sun Mar 16 14:42:58 2014
New Revision: 263244
URL: http://svnweb.freebsd.org/changeset/base/263244

Log:
  find: When performing -quit, finish pending -exec ... + command lines.
  
  This avoids unexpected partial processing when a find command uses both
  -quit and -exec ... +.
  
  GNU find does the same.
  
  MFC after:	1 week

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

Modified: head/usr.bin/find/function.c
==============================================================================
--- head/usr.bin/find/function.c	Sun Mar 16 14:21:09 2014	(r263243)
+++ head/usr.bin/find/function.c	Sun Mar 16 14:42:58 2014	(r263244)
@@ -1774,6 +1774,7 @@ f_false(PLAN *plan __unused, FTSENT *ent
 int
 f_quit(PLAN *plan __unused, FTSENT *entry __unused)
 {
+	finish_execplus();
 	exit(0);
 }