===================================================================
RCS file: /cvs/mandoc/Attic/mdoc_action.c,v
retrieving revision 1.3
retrieving revision 1.9
diff -u -p -r1.3 -r1.9
--- mandoc/Attic/mdoc_action.c	2009/04/02 06:51:44	1.3
+++ mandoc/Attic/mdoc_action.c	2009/06/10 20:18:43	1.9
@@ -1,20 +1,18 @@
-/* $Id: mdoc_action.c,v 1.3 2009/04/02 06:51:44 kristaps Exp $ */
+/*	$Id: mdoc_action.c,v 1.9 2009/06/10 20:18:43 kristaps Exp $ */
 /*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
  * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 #include <sys/utsname.h>
 
@@ -195,7 +193,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 +210,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,8 +341,11 @@ post_nm(POST_ARGS)
 
 	if (m->meta.name)
 		return(1);
+
+	buf[0] = 0;
 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
 		return(0);
+
 	if (NULL == (m->meta.name = strdup(buf)))
 		return(verr(m, EMALLOC));
 
@@ -367,6 +367,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 +497,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 +697,7 @@ post_dd(POST_ARGS)
 {
 	char		  buf[64];
 
+	buf[0] = 0;
 	if ( ! concat(m, m->last->child, buf, sizeof(buf)))
 		return(0);