===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_action.c,v
retrieving revision 1.3
retrieving revision 1.6
diff -u -p -r1.3 -r1.6
--- mandoc/Attic/mdoc_action.c	2009/04/02 06:51:44	1.3
+++ mandoc/Attic/mdoc_action.c	2009/04/06 08:53:12	1.6
@@ -1,4 +1,4 @@
-/* $Id: mdoc_action.c,v 1.3 2009/04/02 06:51:44 kristaps Exp $ */
+/* $Id: mdoc_action.c,v 1.6 2009/04/06 08:53:12 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -195,7 +195,6 @@ const	struct actions mdoc_actions[MDOC_MAX] = {
 
 
 #ifdef __linux__
-extern	size_t	strlcpy(char *, const char *, size_t);
 extern	size_t	strlcat(char *, const char *, size_t);
 #endif
 
@@ -213,9 +212,9 @@ mdoc_action_pre(struct mdoc *m, const struct mdoc_node
 		break;
 	}
 
-	if (NULL == mdoc_actions[m->last->tok].pre)
+	if (NULL == mdoc_actions[n->tok].pre)
 		return(1);
-	return((*mdoc_actions[m->last->tok].pre)(m, n));
+	return((*mdoc_actions[n->tok].pre)(m, n));
 }
 
 
@@ -344,11 +343,20 @@ post_nm(POST_ARGS)
 
 	if (m->meta.name)
 		return(1);
+
+	printf("bar\n");
+
+	buf[0] = 0;
 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
 		return(0);
+
+	printf("foo\n");
+
 	if (NULL == (m->meta.name = strdup(buf)))
 		return(verr(m, EMALLOC));
 
+	printf("baz\n");
+
 	return(1);
 }
 
@@ -367,6 +375,8 @@ post_sh(POST_ARGS)
 
 	if (MDOC_HEAD != m->last->type)
 		return(1);
+
+	buf[0] = 0;
 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
 		return(0);
 	if (SEC_CUSTOM != (sec = mdoc_atosec(buf)))
@@ -495,13 +505,15 @@ post_os(POST_ARGS)
 
 	if (m->meta.os)
 		free(m->meta.os);
+
+	buf[0] = 0;
 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
 		return(0);
 
 	if (0 == buf[0]) {
 		if (-1 == uname(&utsname))
 			return(mdoc_err(m, "utsname"));
-		if (strlcpy(buf, utsname.sysname, 64) >= 64)
+		if (strlcat(buf, utsname.sysname, 64) >= 64)
 			return(verr(m, ETOOLONG));
 		if (strlcat(buf, " ", 64) >= 64)
 			return(verr(m, ETOOLONG));
@@ -693,6 +705,7 @@ post_dd(POST_ARGS)
 {
 	char		  buf[64];
 
+	buf[0] = 0;
 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
 		return(0);