From owner-p4-projects@FreeBSD.ORG  Tue Nov 14 20:47:05 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6113E16A6A6; Tue, 14 Nov 2006 20:47:05 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 3E14316A51A
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 20:47:05 +0000 (UTC)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9D1FF4408B
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 20:40:51 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kAEKeicV048169
	for <perforce@freebsd.org>; Tue, 14 Nov 2006 20:40:44 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kAEKei7Y048166
	for perforce@freebsd.org; Tue, 14 Nov 2006 20:40:44 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 14 Nov 2006 20:40:44 GMT
Message-Id: <200611142040.kAEKei7Y048166@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	millert@freebsd.org using -f
From: Todd Miller <millert@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 109990 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 14 Nov 2006 20:47:05 -0000

http://perforce.freebsd.org/chv.cgi?CH=109990

Change 109990 by millert@millert_g5tower on 2006/11/14 20:40:34

	Update from FreeBSD

Affected files ...

.. //depot/projects/trustedbsd/sedarwin8/darwin/mac_cmds/getfmac/getfmac.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin8/darwin/mac_cmds/getfmac/getfmac.c#2 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD: src/usr.sbin/getfmac/getfmac.c,v 1.1 2002/10/23 03:15:23 rwatson Exp $
+ * $FreeBSD: src/usr.sbin/getfmac/getfmac.c,v 1.3 2005/01/27 14:44:38 delphij Exp $
  */
 #include <sys/types.h>
 #include <security/mac.h>
@@ -46,22 +46,21 @@
 
 #define	MAXELEMENTS	32
 
-void
+static void
 usage(void)
 {
 
 	fprintf(stderr,
 	    "getfmac [-h] [-l list,of,labels] [file1] [file2 ...]\n");
-
 	exit (EX_USAGE);
 }
 
 int
 main(int argc, char *argv[])
 {
-	char ch, *labellist, *string;
+	char *labellist, *string;
 	mac_t label;
-	int hflag;
+	int ch, hflag;
 	int error, i;
 
 	labellist = NULL;
@@ -94,9 +93,9 @@
 		}
 
 		if (hflag)
-			error = mac_get_link (argv[i], label);
+			error = mac_get_link(argv[i], label);
 		else
-			error = mac_get_file (argv[i], label);
+			error = mac_get_file(argv[i], label);
 		if (error) {
 			perror(argv[i]);
 			mac_free(label);
@@ -104,9 +103,9 @@
 		}
 
 		error = mac_to_text(label, &string);
-		if (error != 0) {
+		if (error != 0)
 			perror("mac_to_text");
-		} else {
+		else {
 			printf("%s: %s\n", argv[i], string);
 			free(string);
 		}