From owner-p4-projects@FreeBSD.ORG  Tue Mar  7 16:29: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 5265416A43A; Tue,  7 Mar 2006 16:29:52 +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 E0E8C16A425
	for <perforce@freebsd.org>; Tue,  7 Mar 2006 16:29:51 +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 B398943DA0
	for <perforce@freebsd.org>; Tue,  7 Mar 2006 16:29:43 +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 k27GThVe005175
	for <perforce@freebsd.org>; Tue, 7 Mar 2006 16:29:43 GMT
	(envelope-from millert@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k27GThhh005171
	for perforce@freebsd.org; Tue, 7 Mar 2006 16:29:43 GMT
	(envelope-from millert@freebsd.org)
Date: Tue, 7 Mar 2006 16:29:43 GMT
Message-Id: <200603071629.k27GThhh005171@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 92915 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, 07 Mar 2006 16:29:54 -0000

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

Change 92915 by millert@millert_ibook on 2006/03/07 16:29:41

	Print out text labels too.

Affected files ...

.. //depot/projects/trustedbsd/sedarwin7/examples/labelh/labelh_test.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin7/examples/labelh/labelh_test.c#2 (text+ko) ====

@@ -42,7 +42,7 @@
 {
         kern_return_t		kr;
 	mach_port_name_t	labelHandle, portName;
-	char			*textlabel;
+	char			*textlabel, textbuf[512];
 	int			ch, count, dealloc, destroy, getnew, getport;
 	int			gettask, reqlabel, i;
 
@@ -109,7 +109,8 @@
 				mach_error(":", kr);
 				exit(1);
 			}
-			printf("new label handle: 0x%x\n", labelHandle);
+			printf("new label handle: 0x%x (%s)\n", labelHandle,
+			    textlabel);
 		}
 		if (gettask) {
 			/* Get label handle for our task */
@@ -119,7 +120,14 @@
 				mach_error("mach_get_task_label():", kr);
 				exit(1);
 			}
-			printf("task label handle: 0x%x\n", labelHandle);
+			kr = mach_get_task_label_text(mach_task_self(),
+			    "sebsd", textbuf);
+			if (kr != KERN_SUCCESS) {
+				mach_error("mach_get_task_label_text():", kr);
+				exit(1);
+			}
+			printf("task label handle: 0x%x (%s)\n", labelHandle,
+			    textbuf);
 		}
 		if (getport) {
 			/* Get a label handle for the new port */
@@ -129,7 +137,14 @@
 				mach_error("mach_get_label():", kr);
 				exit(1);
 			}
-			printf("port label handle: 0x%x\n", labelHandle);
+			kr = mach_get_label_text(mach_task_self(), labelHandle,
+			    "sebsd", textbuf);
+			if (kr != KERN_SUCCESS) {
+				mach_error("mach_get_label_text():", kr);
+				exit(1);
+			}
+			printf("port label handle: 0x%x (%s)\n", labelHandle,
+			    textbuf);
 		}
 		if (reqlabel) {
 			/* Compute label handle based on port and task. */
@@ -139,7 +154,14 @@
 				mach_error("mac_request_label():", kr);
 				exit(1);
 			}
-			printf("coputed label handle: 0x%x\n", labelHandle);
+			kr = mach_get_label_text(mach_task_self(), labelHandle,
+			    "sebsd", textbuf);
+			if (kr != KERN_SUCCESS) {
+				mach_error("mach_get_label_text():", kr);
+				exit(1);
+			}
+			printf("computed label handle: 0x%x (%s)\n",
+			    labelHandle, textbuf);
 		}
 		if (dealloc) {
 			/* Deallocate the label handle */
@@ -167,7 +189,7 @@
 void
 usage(void)
 {
-	fprintf(stderr, "usage: %s [-c count] [-dx] -n text_label | -t | -p\n",
+	fprintf(stderr, "usage: %s [-c count] [-dx] -n text_label | -t | -r | -p\n",
 	    __progname);
 	exit(1);
 }