[Midnightbsd-cvs] src [10747] trunk/usr.sbin/getpmac/getpmac.c: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10747
          http://svnweb.midnightbsd.org/src/?rev=10747
Author:   laffer1
Date:     2018-06-09 18:14:13 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/usr.sbin/getpmac/Makefile
    trunk/usr.sbin/getpmac/getpmac.8
    trunk/usr.sbin/getpmac/getpmac.c

Property Changed:
----------------
    trunk/usr.sbin/getpmac/getpmac.8

Modified: trunk/usr.sbin/getpmac/Makefile
===================================================================
--- trunk/usr.sbin/getpmac/Makefile	2018-06-09 22:13:55 UTC (rev 10746)
+++ trunk/usr.sbin/getpmac/Makefile	2018-06-09 22:14:13 UTC (rev 10747)
@@ -1,8 +1,7 @@
-# $FreeBSD: src/usr.sbin/getpmac/Makefile,v 1.5 2005/01/27 14:52:46 delphij Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/usr.sbin/getpmac/Makefile 201390 2010-01-02 11:07:44Z ed $
 
 PROG=   getpmac
 MAN=	getpmac.8
 
-WARNS?=	6
-
 .include <bsd.prog.mk>

Modified: trunk/usr.sbin/getpmac/getpmac.8
===================================================================
--- trunk/usr.sbin/getpmac/getpmac.8	2018-06-09 22:13:55 UTC (rev 10746)
+++ trunk/usr.sbin/getpmac/getpmac.8	2018-06-09 22:14:13 UTC (rev 10747)
@@ -1,3 +1,4 @@
+.\" $MidnightBSD$
 .\" Copyright (c) 2003 Networks Associates Technology, Inc.
 .\" All rights reserved.
 .\"
@@ -28,7 +29,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $FreeBSD: src/usr.sbin/getpmac/getpmac.8,v 1.4 2003/02/24 22:53:25 ru Exp $
+.\" $FreeBSD: stable/10/usr.sbin/getpmac/getpmac.8 111447 2003-02-24 22:53:26Z ru $
 .\"
 .Dd January 14, 2003
 .Dt GETPMAC 8


Property changes on: trunk/usr.sbin/getpmac/getpmac.8
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.sbin/getpmac/getpmac.c
===================================================================
--- trunk/usr.sbin/getpmac/getpmac.c	2018-06-09 22:13:55 UTC (rev 10746)
+++ trunk/usr.sbin/getpmac/getpmac.c	2018-06-09 22:14:13 UTC (rev 10747)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*-
  * Copyright (c) 2002 Networks Associates Technology, Inc.
  * All rights reserved.
@@ -31,7 +32,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.sbin/getpmac/getpmac.c,v 1.3 2005/01/27 14:44:39 delphij Exp $
+ * $FreeBSD: stable/10/usr.sbin/getpmac/getpmac.c 195971 2009-07-30 09:51:04Z rwatson $
  */
 #include <sys/types.h>
 #include <sys/mac.h>
@@ -103,8 +104,7 @@
 		error = mac_get_pid(pid, label);
 		if (error)
 			perror("mac_get_pid");
-	}
-	else {
+	} else {
 		error = mac_get_proc(label);
 		if (error)
 			perror("mac_get_proc");
@@ -119,7 +119,8 @@
 		exit(EX_DATAERR);
 	}
 
-	printf("%s\n", string);
+	if (strlen(string) > 0)
+		printf("%s\n", string);
 		
 	mac_free(label);
 	free(string);