===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.296
retrieving revision 1.301
diff -u -p -r1.296 -r1.301
--- mandoc/main.c	2017/07/01 12:54:07	1.296
+++ mandoc/main.c	2017/07/26 10:21:55	1.301
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.296 2017/07/01 12:54:07 schwarze Exp $ */
+/*	$Id: main.c,v 1.301 2017/07/26 10:21:55 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
@@ -111,6 +111,7 @@ static	const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2
 static	char		  help_arg[] = "help";
 static	char		 *help_argv[] = {help_arg, NULL};
 static	enum mandoclevel  rc;
+static	FILE		 *mmsg_stream;
 
 
 int
@@ -190,6 +191,7 @@ main(int argc, char *argv[])
 	curp.mmin = MANDOCERR_MAX;
 	curp.outopts = &conf.output;
 	options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;
+	mmsg_stream = stderr;
 
 	use_pager = 1;
 	tag_files = NULL;
@@ -476,7 +478,7 @@ main(int argc, char *argv[])
 				parse(&curp, fd, *argv);
 			else if (resp->form == FORM_SRC) {
 				/* For .so only; ignore failure. */
-				chdir(conf.manpath.paths[resp->ipath]);
+				(void)chdir(conf.manpath.paths[resp->ipath]);
 				parse(&curp, fd, resp->file);
 			} else
 				passthrough(resp->file, fd,
@@ -763,8 +765,7 @@ parse(struct curparse *curp, int fd, const char *file)
 
 	if (man == NULL)
 		return;
-	if (curp->mmin < MANDOCERR_STYLE)
-		mandoc_xr_reset();
+	mandoc_xr_reset();
 	if (man->macroset == MACROSET_MDOC) {
 		if (curp->outtype != OUTT_TREE || !curp->outopts->noval)
 			mdoc_validate(man);
@@ -816,7 +817,8 @@ parse(struct curparse *curp, int fd, const char *file)
 			break;
 		}
 	}
-	check_xr(file);
+	if (curp->mmin < MANDOCERR_STYLE)
+		check_xr(file);
 	mparse_updaterc(curp->mp, &rc);
 }
 
@@ -833,6 +835,8 @@ check_xr(const char *file)
 		manpath_base(&paths);
 
 	for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) {
+		if (xr->line == -1)
+			continue;
 		search.arch = NULL;
 		search.sec = xr->sec;
 		search.outkey = NULL;
@@ -842,7 +846,11 @@ check_xr(const char *file)
 			continue;
 		if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz))
 			continue;
-		mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec);
+		if (xr->count == 1)
+			mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec);
+		else
+			mandoc_asprintf(&cp, "Xr %s %s (%d times)",
+			    xr->name, xr->sec, xr->count);
 		mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE,
 		    file, xr->line, xr->pos + 1, cp);
 		free(cp);
@@ -988,6 +996,7 @@ toptions(struct curparse *curp, char *arg)
 	else if (0 == strcmp(arg, "lint")) {
 		curp->outtype = OUTT_LINT;
 		curp->mmin = MANDOCERR_BASE;
+		mmsg_stream = stdout;
 	} else if (0 == strcmp(arg, "tree"))
 		curp->outtype = OUTT_TREE;
 	else if (0 == strcmp(arg, "man"))
@@ -1077,22 +1086,21 @@ mmsg(enum mandocerr t, enum mandoclevel lvl,
 {
 	const char	*mparse_msg;
 
-	fprintf(stderr, "%s: %s:", getprogname(),
+	fprintf(mmsg_stream, "%s: %s:", getprogname(),
 	    file == NULL ? "<stdin>" : file);
 
 	if (line)
-		fprintf(stderr, "%d:%d:", line, col + 1);
+		fprintf(mmsg_stream, "%d:%d:", line, col + 1);
 
-	fprintf(stderr, " %s",
-	    t < MANDOCERR_STYLE ? "BASE" : mparse_strlevel(lvl));
+	fprintf(mmsg_stream, " %s", mparse_strlevel(lvl));
 
 	if ((mparse_msg = mparse_strerror(t)) != NULL)
-		fprintf(stderr, ": %s", mparse_msg);
+		fprintf(mmsg_stream, ": %s", mparse_msg);
 
 	if (msg)
-		fprintf(stderr, ": %s", msg);
+		fprintf(mmsg_stream, ": %s", msg);
 
-	fputc('\n', stderr);
+	fputc('\n', mmsg_stream);
 }
 
 static pid_t