From owner-svn-src-head@FreeBSD.ORG  Sat Jun 20 20:22:12 2009
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:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7C92F106564A;
	Sat, 20 Jun 2009 20:22:12 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 6AF788FC1D;
	Sat, 20 Jun 2009 20:22:12 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5KKMC20085902;
	Sat, 20 Jun 2009 20:22:12 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5KKMCet085900;
	Sat, 20 Jun 2009 20:22:12 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906202022.n5KKMCet085900@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 20 Jun 2009 20:22:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194555 - head/usr.sbin/getpmac
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Sat, 20 Jun 2009 20:22:13 -0000

Author: rwatson
Date: Sat Jun 20 20:22:11 2009
New Revision: 194555
URL: http://svn.freebsd.org/changeset/base/194555

Log:
  If the label being printed by getpmac(8) is empty, then don't print a
  carriage return.
  
  Obtained from:	TrustedBSD Project
  MFC after:	3 days

Modified:
  head/usr.sbin/getpmac/getpmac.c

Modified: head/usr.sbin/getpmac/getpmac.c
==============================================================================
--- head/usr.sbin/getpmac/getpmac.c	Sat Jun 20 19:09:41 2009	(r194554)
+++ head/usr.sbin/getpmac/getpmac.c	Sat Jun 20 20:22:11 2009	(r194555)
@@ -119,7 +119,8 @@ main(int argc, char *argv[])
 		exit(EX_DATAERR);
 	}
 
-	printf("%s\n", string);
+	if (strlen(string) > 0)
+		printf("%s\n", string);
 		
 	mac_free(label);
 	free(string);