From owner-svn-src-all@FreeBSD.ORG  Sat Apr  5 20:05:50 2014
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id B7CA5F59;
 Sat,  5 Apr 2014 20:05:50 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A3DA28EC;
 Sat,  5 Apr 2014 20:05:50 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s35K5ou0061504;
 Sat, 5 Apr 2014 20:05:50 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s35K5ojY061503;
 Sat, 5 Apr 2014 20:05:50 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201404052005.s35K5ojY061503@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Sat, 5 Apr 2014 20:05:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r264169 - stable/10/usr.bin/find
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 05 Apr 2014 20:05:50 -0000

Author: jilles
Date: Sat Apr  5 20:05:50 2014
New Revision: 264169
URL: http://svnweb.freebsd.org/changeset/base/264169

Log:
  MFC r263244: 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.

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

Modified: stable/10/usr.bin/find/function.c
==============================================================================
--- stable/10/usr.bin/find/function.c	Sat Apr  5 20:01:08 2014	(r264168)
+++ stable/10/usr.bin/find/function.c	Sat Apr  5 20:05:50 2014	(r264169)
@@ -1768,6 +1768,7 @@ f_false(PLAN *plan __unused, FTSENT *ent
 int
 f_quit(PLAN *plan __unused, FTSENT *entry __unused)
 {
+	finish_execplus();
 	exit(0);
 }