From owner-p4-projects@FreeBSD.ORG  Fri Aug 29 06:10:31 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 08A1316A4C1; Fri, 29 Aug 2003 06:10:31 -0700 (PDT)
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 C11C916A4BF
	for <perforce@freebsd.org>; Fri, 29 Aug 2003 06:10:30 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3824743FE1
	for <perforce@freebsd.org>; Fri, 29 Aug 2003 06:10:30 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7TDAT0U022573
	for <perforce@freebsd.org>; Fri, 29 Aug 2003 06:10:29 -0700 (PDT)
	(envelope-from cvance@nailabs.com)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7TDATur022570
	for perforce@freebsd.org; Fri, 29 Aug 2003 06:10:29 -0700 (PDT)
Date: Fri, 29 Aug 2003 06:10:29 -0700 (PDT)
Message-Id: <200308291310.h7TDATur022570@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	cvance@nailabs.com using -f
From: Chris Vance <cvance@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 37168 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
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: Fri, 29 Aug 2003 13:10:31 -0000

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

Change 37168 by cvance@cvance_release on 2003/08/29 06:10:08

	A better fix for the comma bug.

Affected files ...

.. //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#8 edit

Differences ...

==== //depot/projects/trustedbsd/sebsd/sys/kern/kern_mac.c#8 (text+ko) ====

@@ -427,10 +427,9 @@
 		 } else							\
 			ignorenotfound = 0;				\
 		savedlen = sbuf_len(&sb);				\
-		if (first == 1) {      					\
+		if (first == 1)						\
 			error = sbuf_printf(&sb, "%s/", element_name);	\
-			first--;					\
-		} else							\
+		else							\
 			error = sbuf_printf(&sb, ",%s/", element_name);	\
 		if (error == -1) {					\
 			error = EINVAL;	/* XXX: E2BIG? */		\
@@ -444,10 +443,11 @@
 		if (claimed == 0 && ignorenotfound) {			\
 			/* Revert last label name. */			\
 			sbuf_setpos(&sb, savedlen);			\
-			first++;					\
 		} else if (claimed != 1) {				\
 			error = EINVAL;	/* XXX: ENOLABEL? */		\
 			break;						\
+		} else {						\
+			first = 0;					\
 		}							\
 	}								\
 	sbuf_finish(&sb);						\