===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -p -r1.5 -r1.7
--- mandoc/mandocdb.c	2011/07/15 17:59:29	1.5
+++ mandoc/mandocdb.c	2011/11/13 00:53:13	1.7
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.5 2011/07/15 17:59:29 kristaps Exp $ */
+/*	$Id: mandocdb.c,v 1.7 2011/11/13 00:53:13 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -1168,10 +1168,9 @@ pman_node(MAN_ARGS)
 		}
 	}
 
-	if (pman_node(hash, buf, dbuf, n->child))
-		return(1);
-	if (pman_node(hash, buf, dbuf, n->next))
-		return(1);
+	for (n = n->child; n; n = n->next)
+		if (pman_node(hash, buf, dbuf, n))
+			return(1);
 
 	return(0);
 }
@@ -1254,7 +1253,7 @@ ofile_dirbuild(const char *dir, int verb, struct of **
 		buf[0] = '\0';
 		strlcat(buf, dir, MAXPATHLEN);
 		strlcat(buf, "/", MAXPATHLEN);
-		strlcat(buf, fn, MAXPATHLEN);
+		sz = strlcat(buf, fn, MAXPATHLEN);
 		if (sz >= MAXPATHLEN) {
 			fprintf(stderr, "%s: Path too long\n", dir);
 			return(0);
@@ -1276,6 +1275,7 @@ ofile_dirbuild(const char *dir, int verb, struct of **
 		}
 	}
 
+	closedir(d);
 	return(1);
 }