===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- src/usr.bin/mandoc/roff.c	2010/07/25 18:05:54	1.9
+++ src/usr.bin/mandoc/roff.c	2010/07/31 21:43:07	1.10
@@ -1,4 +1,4 @@
-/*	$Id: roff.c,v 1.9 2010/07/25 18:05:54 schwarze Exp $ */
+/*	$Id: roff.c,v 1.10 2010/07/31 21:43:07 schwarze Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -943,30 +943,40 @@
 static enum rofferr
 roff_ds(ROFF_ARGS)
 {
-	char *name, *string, *end;
+	char		*name, *string;
 
+	/*
+	 * A symbol is named by the first word following the macro
+	 * invocation up to a space.  Its value is anything after the
+	 * name's trailing whitespace and optional double-quote.  Thus,
+	 *
+	 *  [.ds foo "bar  "     ]
+	 *
+	 * will have `bar  "     ' as its value.
+	 */
+
 	name = *bufp + pos;
 	if ('\0' == *name)
 		return(ROFF_IGN);
 
 	string = name;
+	/* Read until end of name. */
 	while (*string && ' ' != *string)
 		string++;
+
+	/* Nil-terminate name. */
 	if (*string)
-		*(string++) = NULL;
-	if (*string && '"' == *string)
-		string++;
+		*(string++) = '\0';
+	
+	/* Read past spaces. */
 	while (*string && ' ' == *string)
 		string++;
-	end = string;
-	while (*end)
-		end++;
-	if (string < end) {
-		end--;
-		if (*end == '"')
-			*end = '\0';
-	}
 
+	/* Read passed initial double-quote. */
+	if (*string && '"' == *string)
+		string++;
+
+	/* The rest is the value. */
 	roff_setstr(r, name, string);
 	return(ROFF_IGN);
 }
@@ -1040,7 +1050,7 @@
 	const struct roffstr *n;
 
 	n = r->first_string;
-	while (n && (strncmp(name, n->name, len) || '\0' != n->name[len]))
+	while (n && (strncmp(name, n->name, len) || '\0' != n->name[(int)len]))
 		n = n->next;
 
 	return(n ? n->string : NULL);