===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.7
retrieving revision 1.10
diff -u -p -r1.7 -r1.10
--- mandoc/man.c	2009/03/25 21:03:13	1.7
+++ mandoc/man.c	2009/03/26 11:16:21	1.10
@@ -1,4 +1,4 @@
-/* $Id: man.c,v 1.7 2009/03/25 21:03:13 kristaps Exp $ */
+/* $Id: man.c,v 1.10 2009/03/26 11:16:21 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -18,6 +18,7 @@
  */
 #include <assert.h>
 #include <ctype.h>
+#include <err.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <stdio.h>
@@ -274,7 +275,7 @@ man_ptext(struct man *m, int line, char *buf)
 int
 man_pmacro(struct man *m, int ln, char *buf)
 {
-	int		  i, c;
+	int		  i, j, c, ppos;
 	char		  mac[5];
 
 	/* Comments and empties are quickly ignored. */
@@ -282,48 +283,53 @@ man_pmacro(struct man *m, int ln, char *buf)
 	if (0 == buf[1])
 		return(1);
 
-	if (' ' == buf[1]) {
-		i = 2;
+	i = 1;
+
+	if (' ' == buf[i]) {
+		i++;
 		while (buf[i] && ' ' == buf[i])
 			i++;
 		if (0 == buf[i])
 			return(1);
-		return(man_vwarn(m, ln, 0, "invalid syntax"));
 	}
 
-	if (buf[1] && '\\' == buf[1])
-		if (buf[2] && '\"' == buf[2])
+	ppos = i;
+
+	if (buf[i] && '\\' == buf[i])
+		if (buf[i + 1] && '\"' == buf[i + 1])
 			return(1);
 
 	/* Copy the first word into a nil-terminated buffer. */
 
-	for (i = 1; i < 5; i++) {
-		if (0 == (mac[i - 1] = buf[i]))
+	for (j = 0; j < 4; j++, i++) {
+		if (0 == (mac[j] = buf[i]))
 			break;
 		else if (' ' == buf[i])
 			break;
 	}
 
-	mac[i - 1] = 0;
+	mac[j] = 0;
 
-	if (i == 5 || i <= 1) {
+	if (j == 4 || j < 1) {
 		if ( ! (MAN_IGN_MACRO & m->pflags)) {
-			(void)man_verr(m, ln, 1, 
+			(void)man_verr(m, ln, ppos, 
 				"ill-formed macro: %s", mac);
 			goto err;
 		} 
-		if ( ! man_vwarn(m, ln, 1, "ill-formed macro: %s", mac))
+		if ( ! man_vwarn(m, ln, ppos, 
+				"ill-formed macro: %s", mac))
 			goto err;
 		return(1);
 	}
 	
 	if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
 		if ( ! (MAN_IGN_MACRO & m->pflags)) {
-			(void)man_verr(m, ln, 1, 
+			(void)man_verr(m, ln, ppos, 
 				"unknown macro: %s", mac);
 			goto err;
 		} 
-		if ( ! man_vwarn(m, ln, 1, "unknown macro: %s", mac))
+		if ( ! man_vwarn(m, ln, ppos, 
+				"unknown macro: %s", mac))
 			goto err;
 		return(1);
 	}
@@ -335,7 +341,7 @@ man_pmacro(struct man *m, int ln, char *buf)
 
 	/* Begin recursive parse sequence. */
 
-	if ( ! man_macro(m, c, ln, 1, &i, buf))
+	if ( ! man_macro(m, c, ln, ppos, &i, buf))
 		goto err;
 
 	return(1);