===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.36
retrieving revision 1.44
diff -u -p -r1.36 -r1.44
--- mandoc/man.c	2009/08/21 13:18:32	1.36
+++ mandoc/man.c	2009/10/27 08:26:12	1.44
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.36 2009/08/21 13:18:32 kristaps Exp $ */
+/*	$Id: man.c,v 1.44 2009/10/27 08:26:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,8 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#include <sys/types.h>
+
 #include <assert.h>
 #include <ctype.h>
 #include <stdarg.h>
@@ -38,7 +40,6 @@ const	char *const __man_merrnames[WERRMAX] = {		 
 	"expected block head arguments", /* WHEADARGS */
 	"expected block body arguments", /* WBODYARGS */
 	"expected empty block head", /* WNHEADARGS */
-	"unknown macro", /* WMACRO */
 	"ill-formed macro", /* WMACROFORM */
 	"scope open on exit", /* WEXITSCOPE */
 	"no scope context", /* WNOSCOPE */
@@ -54,7 +55,7 @@ const	char *const __man_macronames[MAN_MAX] = {		 
 	"R",		"B",		"I",		"IR",
 	"RI",		"na",		"i",		"sp",
 	"nf",		"fi",		"r",		"RE",
-	"RS",		"DT"
+	"RS",		"DT",		"UC",		"PD"
 	};
 
 const	char * const *man_macronames = __man_macronames;
@@ -69,6 +70,7 @@ static	void		 man_free1(struct man *);
 static	int		 man_alloc1(struct man *);
 static	int		 pstring(struct man *, int, int, 
 				const char *, size_t);
+static	int		 macrowarn(struct man *, int, const char *);
 
 #ifdef __linux__
 extern	size_t	  	  strlcpy(char *, const char *, size_t);
@@ -105,9 +107,6 @@ man_free(struct man *man)
 {
 
 	man_free1(man);
-
-	if (man->htab)
-		man_hash_free(man->htab);
 	free(man);
 }
 
@@ -125,14 +124,11 @@ man_alloc(void *data, int pflags, const struct man_cb 
 		return(NULL);
 	}
 
+	man_hash_init();
+
 	p->data = data;
 	p->pflags = pflags;
 	(void)memcpy(&p->cb, cb, sizeof(struct man_cb));
-
-	if (NULL == (p->htab = man_hash_alloc())) {
-		free(p);
-		return(NULL);
-	}
 	return(p);
 }
 
@@ -179,7 +175,7 @@ static int
 man_alloc1(struct man *m)
 {
 
-	bzero(&m->meta, sizeof(struct man_meta));
+	memset(&m->meta, 0, sizeof(struct man_meta));
 	m->flags = 0;
 	m->last = calloc(1, sizeof(struct man_node));
 	if (NULL == m->last)
@@ -378,14 +374,15 @@ man_node_free(struct man_node *p)
 void
 man_node_freelist(struct man_node *p)
 {
+	struct man_node	*n;
 
 	if (p->child)
 		man_node_freelist(p->child);
-	if (p->next)
-		man_node_freelist(p->next);
-
 	assert(0 == p->nchild);
+	n = p->next;
 	man_node_free(p);
+	if (n)
+		man_node_freelist(n);
 }
 
 
@@ -459,6 +456,18 @@ descope:
 }
 
 
+static int
+macrowarn(struct man *m, int ln, const char *buf)
+{
+	if ( ! (MAN_IGN_MACRO & m->pflags))
+		return(man_verr(m, ln, 0, 
+				"unknown macro: %s%s", 
+				buf, strlen(buf) > 3 ? "..." : ""));
+	return(man_vwarn(m, ln, 0, "unknown macro: %s%s",
+				buf, strlen(buf) > 3 ? "..." : ""));
+}
+
+
 int
 man_pmacro(struct man *m, int ln, char *buf)
 {
@@ -492,6 +501,12 @@ man_pmacro(struct man *m, int ln, char *buf)
 			break;
 		else if (' ' == buf[i])
 			break;
+
+		/* Check for invalid characters. */
+
+		if (isgraph((u_char)buf[i]))
+			continue;
+		return(man_perr(m, ln, i, WNPRINT));
 	}
 
 	mac[j] = 0;
@@ -506,13 +521,9 @@ man_pmacro(struct man *m, int ln, char *buf)
 		return(1);
 	}
 	
-	if (MAN_MAX == (c = man_hash_find(m->htab, mac))) {
-		if ( ! (MAN_IGN_MACRO & m->pflags)) {
-			(void)man_perr(m, ln, ppos, WMACRO);
+	if (MAN_MAX == (c = man_hash_find(mac))) {
+		if ( ! macrowarn(m, ln, mac))
 			goto err;
-		} 
-		if ( ! man_pwarn(m, ln, ppos, WMACRO))
-			goto err;
 		return(1);
 	}
 
@@ -526,6 +537,7 @@ man_pmacro(struct man *m, int ln, char *buf)
 	if (m->flags & MAN_ELINE) {
 		n = m->last;
 		assert(NULL == n->child);
+		assert(0 == n->nchild);
 		if ( ! man_nwarn(m, n, WLNSCOPE))
 			return(0);
 
@@ -534,10 +546,12 @@ man_pmacro(struct man *m, int ln, char *buf)
 			assert(n == n->prev->next);
 			n->prev->next = NULL;
 			m->last = n->prev;
+			m->next = MAN_NEXT_SIBLING;
 		} else {
 			assert(n == n->parent->child);
 			n->parent->child = NULL;
 			m->last = n->parent;
+			m->next = MAN_NEXT_CHILD;
 		}
 
 		man_node_free(n);