From owner-p4-projects@FreeBSD.ORG  Tue Jul 28 22:23:30 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id DCC1D1065677; Tue, 28 Jul 2009 22:23:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 9D14D1065676
	for <perforce@freebsd.org>; Tue, 28 Jul 2009 22:23:29 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 89C348FC1F
	for <perforce@freebsd.org>; Tue, 28 Jul 2009 22:23:29 +0000 (UTC)
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n6SMNTY7049150
	for <perforce@freebsd.org>; Tue, 28 Jul 2009 22:23:29 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n6SMNTQk049148
	for perforce@freebsd.org; Tue, 28 Jul 2009 22:23:29 GMT
	(envelope-from bb+lists.freebsd.perforce@cyrus.watson.org)
Date: Tue, 28 Jul 2009 22:23:29 GMT
Message-Id: <200907282223.n6SMNTQk049148@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bb+lists.freebsd.perforce@cyrus.watson.org using -f
From: Robert Watson <rwatson@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 166705 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, 28 Jul 2009 22:23:30 -0000

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

Change 166705 by rwatson@rwatson_freebsd_capabilities on 2009/07/28 22:23:29

	More minor cleanup.

Affected files ...

.. //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#3 edit

Differences ...

==== //depot/projects/trustedbsd/capabilities/src/tools/cap/sandbox_world/sandbox_world.c#3 (text+ko) ====

@@ -51,7 +51,7 @@
  * doesn't exit until the sandbox is done.
  */
 
-#define	MYNAME	"sandbox_world"
+#define	MYNAME	"sandbox_world"		/* Binary to run in sandbox. */
 
 int
 main(int argc, char *argv[])
@@ -69,6 +69,10 @@
 	    LCH_PERMIT_STDOUT, &lcsp) < 0)
 		err(-1, "lch_start %s", argv[1]);
 
+	/*
+	 * Send a one-byte message to the sandbox and wait for a one-byte
+	 * reply.
+	 */
 	ch = 'X';
 	iov.iov_base = &ch;
 	iov.iov_len = sizeof(ch);
@@ -96,11 +100,10 @@
 		err(-1, "lcs_get");
 
 	while (1) {
-		if (lcs_recvrpc(lchp, &opno, &seqno, &buffer, &len)
-		    < 0) {
+		if (lcs_recvrpc(lchp, &opno, &seqno, &buffer, &len) < 0) {
 			if (errno != EPIPE)
 				err(-6, "lcs_recvrpc");
-				else
+			else
 				exit(-6);
 		}
 		if (len != 1)
@@ -111,7 +114,7 @@
 		iov.iov_len = 1;
 		if (lcs_sendrpc(lchp, opno, seqno, &iov, 1) < 0) {
 			if (errno != EPIPE)
-					err(-8, "lcs_sendrpc");
+				err(-8, "lcs_sendrpc");
 			else
 				exit(-8);
 		}