PERFORCE change 37168 for review

[Chris Vance]

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

Change 37168 by cvance at 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);						\