From owner-svn-src-head@freebsd.org  Thu Aug 24 08:20:24 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 84AD2DD949A;
 Thu, 24 Aug 2017 08:20:24 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 5229F6EE7A;
 Thu, 24 Aug 2017 08:20:24 +0000 (UTC)
 (envelope-from lstewart@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v7O8KNsi066183;
 Thu, 24 Aug 2017 08:20:23 GMT (envelope-from lstewart@FreeBSD.org)
Received: (from lstewart@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v7O8KNh3066182;
 Thu, 24 Aug 2017 08:20:23 GMT (envelope-from lstewart@FreeBSD.org)
Message-Id: <201708240820.v7O8KNh3066182@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: lstewart set sender to
 lstewart@FreeBSD.org using -f
From: Lawrence Stewart <lstewart@FreeBSD.org>
Date: Thu, 24 Aug 2017 08:20:23 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r322831 - head/bin/pkill
X-SVN-Group: head
X-SVN-Commit-Author: lstewart
X-SVN-Commit-Paths: head/bin/pkill
X-SVN-Commit-Revision: 322831
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://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: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Aug 2017 08:20:24 -0000

Author: lstewart
Date: Thu Aug 24 08:20:23 2017
New Revision: 322831
URL: https://svnweb.freebsd.org/changeset/base/322831

Log:
  Only emit the trailing new line added in r322613 when not operating in quiet
  mode.
  
  Reported by:	pho
  MFC after:	1 week
  X-MFC-with:	r322210

Modified:
  head/bin/pkill/pkill.c

Modified: head/bin/pkill/pkill.c
==============================================================================
--- head/bin/pkill/pkill.c	Thu Aug 24 08:09:42 2017	(r322830)
+++ head/bin/pkill/pkill.c	Thu Aug 24 08:20:23 2017	(r322831)
@@ -568,7 +568,7 @@ main(int argc, char **argv)
 			continue;
 		rv |= (*action)(kp);
 	}
-	if (rv && pgrep)
+	if (rv && pgrep && !quiet)
 		putchar('\n');
 	if (!did_action && !pgrep && longfmt)
 		fprintf(stderr,