===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.128
retrieving revision 1.130
diff -u -p -r1.128 -r1.130
--- mandoc/mandocdb.c	2014/04/04 02:31:07	1.128
+++ mandoc/mandocdb.c	2014/04/04 16:43:16	1.130
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.128 2014/04/04 02:31:07 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.130 2014/04/04 16:43:16 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -152,6 +152,7 @@ static	void	 mlink_free(struct mlink *);
 static	void	 mlinks_undupe(struct mpage *);
 static	void	 mpages_free(void);
 static	void	 mpages_merge(struct mchars *, struct mparse *);
+static	void	 names_check(void);
 static	void	 parse_cat(struct mpage *, int);
 static	void	 parse_man(struct mpage *, const struct man_node *);
 static	void	 parse_mdoc(struct mpage *, const struct mdoc_node *);
@@ -224,7 +225,7 @@ static	const struct mdoc_handler mdocs[MDOC_MAX] = {
 	{ NULL, TYPE_In },  /* In */
 	{ NULL, TYPE_Li },  /* Li */
 	{ parse_mdoc_Nd, TYPE_Nd },  /* Nd */
-	{ parse_mdoc_Nm, TYPE_Nm },  /* Nm */
+	{ parse_mdoc_Nm, 0 },  /* Nm */
 	{ NULL, 0 },  /* Op */
 	{ NULL, 0 },  /* Ot */
 	{ NULL, TYPE_Pa },  /* Pa */
@@ -495,6 +496,9 @@ main(int argc, char *argv[])
 				goto out;
 
 			mpages_merge(mc, mp);
+			if (warnings &&
+			    ! (MPARSE_QUICK & mparse_options))
+				names_check();
 			dbclose(0);
 
 			if (j + 1 < dirs.sz) {
@@ -1185,6 +1189,42 @@ nextpage:
 }
 
 static void
+names_check(void)
+{
+	sqlite3_stmt	*stmt;
+	const char	*name, *sec, *arch, *key;
+	size_t		 i;
+	int		 irc;
+
+	sqlite3_prepare_v2(db,
+	  "SELECT name, sec, arch, key FROM ("
+	    "SELECT key, pageid FROM keys "
+	    "WHERE bits & ? AND NOT EXISTS ("
+	      "SELECT pageid FROM mlinks "
+	      "WHERE mlinks.pageid == keys.pageid "
+	      "AND mlinks.name == keys.key"
+	    ")"
+	  ") JOIN ("
+	    "SELECT * FROM mlinks GROUP BY pageid"
+	  ") USING (pageid);",
+	  -1, &stmt, NULL);
+
+	i = 1;
+	SQL_BIND_INT64(stmt, i, TYPE_NAME);
+
+	while (SQLITE_ROW == (irc = sqlite3_step(stmt))) {
+		name = sqlite3_column_text(stmt, 0);
+		sec  = sqlite3_column_text(stmt, 1);
+		arch = sqlite3_column_text(stmt, 2);
+		key  = sqlite3_column_text(stmt, 3);
+		say("", "%s(%s%s%s) lacks mlink \"%s\"", name, sec,
+		    '\0' == *arch ? "" : "/",
+		    '\0' == *arch ? "" : arch, key);
+	}
+	sqlite3_finalize(stmt);
+}
+
+static void
 parse_cat(struct mpage *mpage, int fd)
 {
 	FILE		*stream;
@@ -1397,7 +1437,7 @@ parse_man(struct mpage *mpage, const struct man_node *
 				    ('\\' == start[0] && '-' == start[1]))
 					break;
 
-				putkey(mpage, start, TYPE_Nm);
+				putkey(mpage, start, TYPE_NAME | TYPE_Nm);
 
 				if (' ' == byte) {
 					start += sz + 1;
@@ -1411,7 +1451,7 @@ parse_man(struct mpage *mpage, const struct man_node *
 			}
 
 			if (start == title) {
-				putkey(mpage, start, TYPE_Nm);
+				putkey(mpage, start, TYPE_NAME | TYPE_Nm);
 				free(title);
 				return;
 			}
@@ -1588,8 +1628,11 @@ static int
 parse_mdoc_Nm(struct mpage *mpage, const struct mdoc_node *n)
 {
 
-	return(SEC_NAME == n->sec ||
-	    (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type));
+	if (SEC_NAME == n->sec)
+		putmdockey(mpage, n->child, TYPE_NAME | TYPE_Nm);
+	else if (SEC_SYNOPSIS == n->sec && MDOC_HEAD == n->type)
+		putmdockey(mpage, n->child, TYPE_Nm);
+	return(0);
 }
 
 static int