From owner-p4-projects@FreeBSD.ORG  Wed Mar  8 22:04:53 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 26B2816A423; Wed,  8 Mar 2006 22:04:53 +0000 (GMT)
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 C5FDD16A420
	for <perforce@freebsd.org>; Wed,  8 Mar 2006 22:04:52 +0000 (GMT)
	(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 776AC43D46
	for <perforce@freebsd.org>; Wed,  8 Mar 2006 22:04:52 +0000 (GMT)
	(envelope-from millert@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k28M4q2x047625
	for <perforce@freebsd.org>; Wed, 8 Mar 2006 22:04:52 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k28M4qr5047622
	for perforce@freebsd.org; Wed, 8 Mar 2006 22:04:52 GMT
	(envelope-from millert@freebsd.org)
Date: Wed, 8 Mar 2006 22:04:52 GMT
Message-Id: <200603082204.k28M4qr5047622@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 92995 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: Wed, 08 Mar 2006 22:04:54 -0000

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

Change 92995 by millert@millert_g5tower on 2006/03/08 22:04:18

	Add usage(), use err(3).

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/mexec.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/src/darwin/mac_cmds/mexec/mexec.c#3 (text+ko) ====

@@ -1,4 +1,5 @@
 /*-
+ * Copyright (c) 2006 SPARTA, Inc.
  * Copyright (c) 2004 Networks Associates Technology, Inc.
  * All rights reserved.
  *
@@ -26,24 +27,35 @@
 
 #include <sys/types.h>
 #include <sys/mac.h>
+#include <err.h>
+#include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 
+void
+usage(void)
+{
+	extern char *__progname;
+
+	fprintf(stderr, "usage: %s label command_path [command args]\n",
+	    __progname);
+	exit(1);
+}
+
 int
 main(int argc, char *argv[])
 {
 	mac_t exl;
 
-	/* XXXRW: Shouldn't there be an (argc>=3) usage check here? */
-	if (mac_prepare(&exl, "sebsd")) {
-		perror("mexec");
-		return (1);
-	}
-	if (mac_from_text(&exl, argv[1])) {
-		perror(argv[1]);
-		return (1);
-	}
-	argv+=2;
+	if (argc < 3)
+		usage();
+
+	if (mac_prepare(&exl, "sebsd"))
+		err(1, "sebsd");
+	if (mac_from_text(&exl, argv[1]))
+		err(1, argv[1]);
+	argv += 2;
 	if (mac_execve(argv[0], argv, NULL, exl))
-		perror("mexec");
-	return (1);
+		perror(argv[0]);
+	exit(1);
 }