===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.241
retrieving revision 1.245
diff -u -p -r1.241 -r1.245
--- mandoc/mandocdb.c	2017/01/27 01:14:47	1.241
+++ mandoc/mandocdb.c	2017/03/03 13:41:42	1.245
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.241 2017/01/27 01:14:47 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.245 2017/03/03 13:41:42 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -162,7 +162,7 @@ static	void	 putmdockey(const struct mpage *,
 			const struct roff_node *, uint64_t, int);
 static	int	 render_string(char **, size_t *);
 static	void	 say(const char *, const char *, ...)
-			__attribute__((__format__ (printf, 2, 3)));
+			__attribute__((__format__ (__printf__, 2, 3)));
 static	int	 set_basedir(const char *, int);
 static	int	 treescan(void);
 static	size_t	 utf8(unsigned int, char [7]);
@@ -589,7 +589,7 @@ treescan(void)
 	const char	*argv[2];
 
 	argv[0] = ".";
-	argv[1] = (char *)NULL;
+	argv[1] = NULL;
 
 	f = fts_open((char * const *)argv, FTS_PHYSICAL | FTS_NOCHDIR,
 	    fts_compare);
@@ -1211,7 +1211,7 @@ mpages_merge(struct dba *dba, struct mparse *mp)
 		} else if (man != NULL && man->macroset == MACROSET_MAN) {
 			man_validate(man);
 			if (*man->meta.msec != '\0' ||
-			    *man->meta.msec != '\0') {
+			    *man->meta.title != '\0') {
 				mpage->form = FORM_SRC;
 				mpage->sec = mandoc_strdup(man->meta.msec);
 				mpage->arch = mandoc_strdup(mlink->arch);
@@ -1231,8 +1231,12 @@ mpages_merge(struct dba *dba, struct mparse *mp)
 			parse_mdoc(mpage, &man->meta, man->first);
 		else
 			parse_man(mpage, &man->meta, man->first);
-		if (mpage->desc == NULL)
-			mpage->desc = mandoc_strdup(mpage->mlinks->name);
+		if (mpage->desc == NULL) {
+			mpage->desc = mandoc_strdup(mlink->name);
+			if (warnings)
+				say(mlink->file, "No one-line description, "
+				    "using filename \"%s\"", mlink->name);
+		}
 
 		for (mlink = mpage->mlinks;
 		     mlink != NULL;
@@ -1360,7 +1364,8 @@ parse_cat(struct mpage *mpage, int fd)
 			/* Skip to next word. */ ;
 	} else {
 		if (warnings)
-			say(mlink->file, "No dash in title line");
+			say(mlink->file, "No dash in title line, "
+			    "reusing \"%s\" as one-line description", title);
 		p = title;
 	}