===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.59
retrieving revision 1.62
diff -u -p -r1.59 -r1.62
--- mandoc/mandocdb.c	2013/06/05 17:48:14	1.59
+++ mandoc/mandocdb.c	2013/06/06 02:40:37	1.62
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.59 2013/06/05 17:48:14 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.62 2013/06/06 02:40:37 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -140,8 +140,7 @@ static	void	 ofadd(int, const char *, const char *, co
 static	void	 offree(void);
 static	void	 ofmerge(struct mchars *, struct mparse *);
 static	void	 parse_catpage(struct of *);
-static	int	 parse_man(struct of *, 
-			const struct man_node *);
+static	void	 parse_man(struct of *, const struct man_node *);
 static	void	 parse_mdoc(struct of *, const struct mdoc_node *);
 static	int	 parse_mdoc_body(struct of *, const struct mdoc_node *);
 static	int	 parse_mdoc_head(struct of *, const struct mdoc_node *);
@@ -567,6 +566,8 @@ treescan(void)
 		 * Disallow duplicate (hard-linked) files.
 		 */
 		if (FTS_F == ff->fts_info) {
+			if (0 == strcmp(path, MANDOC_DB))
+				continue;
 			if ( ! use_all && ff->fts_level < 2) {
 				if (warnings)
 					say(path, "Extraneous file");
@@ -575,45 +576,50 @@ treescan(void)
 				if (warnings)
 					say(path, "Duplicate file");
 				continue;
-			} 
-
-			cp = ff->fts_name;
-
-			if (0 == strcmp(cp, "mandocdb.db")) {
-				if (warnings)
-					say(path, "Skip database");
-				continue;
-			} else if (NULL != (cp = strrchr(cp, '.'))) {
-				if (0 == strcmp(cp + 1, "html")) {
+			} else if (NULL == (sec =
+					strrchr(ff->fts_name, '.'))) {
+				if ( ! use_all) {
 					if (warnings)
-						say(path, "Skip html");
+						say(path,
+						    "No filename suffix");
 					continue;
-				} else if (0 == strcmp(cp + 1, "gz")) {
-					if (warnings)
-						say(path, "Skip gz");
-					continue;
-				} else if (0 == strcmp(cp + 1, "ps")) {
-					if (warnings)
-						say(path, "Skip ps");
-					continue;
-				} else if (0 == strcmp(cp + 1, "pdf")) {
-					if (warnings)
-						say(path, "Skip pdf");
-					continue;
 				}
+			} else if (0 == strcmp(++sec, "html")) {
+				if (warnings)
+					say(path, "Skip html");
+				continue;
+			} else if (0 == strcmp(sec, "gz")) {
+				if (warnings)
+					say(path, "Skip gz");
+				continue;
+			} else if (0 == strcmp(sec, "ps")) {
+				if (warnings)
+					say(path, "Skip ps");
+				continue;
+			} else if (0 == strcmp(sec, "pdf")) {
+				if (warnings)
+					say(path, "Skip pdf");
+				continue;
+			} else if ( ! use_all &&
+			    ((FORM_SRC == dform && strcmp(sec, dsec)) ||
+			     (FORM_CAT == dform && strcmp(sec, "0")))) {
+				if (warnings)
+					say(path, "Wrong filename suffix");
+				continue;
+			} else {
+				sec[-1] = '\0';
+				sec = stradd(sec);
 			}
-
-			if (NULL != (sec = strrchr(ff->fts_name, '.'))) {
-				*sec = '\0';
-				sec = stradd(sec + 1);
-			}
 			name = stradd(ff->fts_name);
 			ofadd(dform, path, 
 				name, dsec, sec, arch, ff->fts_statp);
 			continue;
 		} else if (FTS_D != ff->fts_info && 
-				FTS_DP != ff->fts_info)
+				FTS_DP != ff->fts_info) {
+			if (warnings)
+				say(path, "Not a regular file");
 			continue;
+		}
 
 		switch (ff->fts_level) {
 		case (0):
@@ -1095,6 +1101,7 @@ parse_catpage(struct of *of)
 	if (NULL == title || '\0' == *title) {
 		if (warnings)
 			say(of->file, "Cannot find NAME section");
+		putkey(of, of->name, TYPE_Nd);
 		fclose(stream);
 		free(title);
 		return;
@@ -1174,7 +1181,7 @@ putmdockey(const struct of *of, const struct mdoc_node
 	}
 }
 
-static int
+static void
 parse_man(struct of *of, const struct man_node *n)
 {
 	const struct man_node *head, *body;
@@ -1183,7 +1190,7 @@ parse_man(struct of *of, const struct man_node *n)
 	size_t		 sz, titlesz;
 
 	if (NULL == n)
-		return(0);
+		return;
 
 	/*
 	 * We're only searching for one thing: the first text child in
@@ -1225,7 +1232,7 @@ parse_man(struct of *of, const struct man_node *n)
 				title[titlesz - 1] = ' ';
 			}
 			if (NULL == title)
-				return(1);
+				return;
 
 			title = mandoc_realloc(title, titlesz + 1);
 			title[titlesz] = '\0';
@@ -1238,7 +1245,7 @@ parse_man(struct of *of, const struct man_node *n)
 
 			if (0 == (sz = strlen(sv))) {
 				free(title);
-				return(1);
+				return;
 			}
 
 			/* Erase trailing space. */
@@ -1249,7 +1256,7 @@ parse_man(struct of *of, const struct man_node *n)
 
 			if (start == sv) {
 				free(title);
-				return(1);
+				return;
 			}
 
 			start = sv;
@@ -1286,7 +1293,7 @@ parse_man(struct of *of, const struct man_node *n)
 			if (sv == start) {
 				putkey(of, start, TYPE_Nm);
 				free(title);
-				return(1);
+				return;
 			}
 
 			while (isspace((unsigned char)*start))
@@ -1310,15 +1317,12 @@ parse_man(struct of *of, const struct man_node *n)
 			of->desc = stradd(start);
 			putkey(of, start, TYPE_Nd);
 			free(title);
-			return(1);
+			return;
 		}
 	}
 
 	for (n = n->child; n; n = n->next)
-		if (parse_man(of, n))
-			return(1);
-
-	return(0);
+		parse_man(of, n);
 }
 
 static void