===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.312
retrieving revision 1.314
diff -u -p -r1.312 -r1.314
--- mandoc/main.c	2018/12/14 01:18:25	1.312
+++ mandoc/main.c	2018/12/20 21:30:32	1.314
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.312 2018/12/14 01:18:25 schwarze Exp $ */
+/*	$Id: main.c,v 1.314 2018/12/20 21:30:32 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org>
@@ -510,7 +510,6 @@ main(int argc, char *argv[])
 		} else
 			thisarg = *argv;
 
-		mandoc_msg_setinfilename(thisarg);
 		fd = mparse_open(curp.mp, thisarg);
 		if (fd != -1) {
 			if (use_pager) {
@@ -523,11 +522,13 @@ main(int argc, char *argv[])
 					    conf.output.tag : *argv;
 			}
 
+			mandoc_msg_setinfilename(thisarg);
 			if (resp == NULL || resp->form == FORM_SRC)
 				parse(&curp, fd, thisarg);
 			else
 				passthrough(resp->file, fd,
 				    conf.output.synopsisonly);
+			mandoc_msg_setinfilename(NULL);
 
 			if (ferror(stdout)) {
 				if (tag_files != NULL) {
@@ -545,8 +546,9 @@ main(int argc, char *argv[])
 					outdata_alloc(&curp);
 				terminal_sepline(curp.outdata);
 			}
-		}
-		mandoc_msg_setinfilename(NULL);
+		} else
+			mandoc_msg(MANDOCERR_FILE, 0, 0,
+			    "%s", strerror(errno));
 
 		if (curp.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK)
 			break;
@@ -889,7 +891,6 @@ check_xr(void)
 	static struct manpaths	 paths;
 	struct mansearch	 search;
 	struct mandoc_xr	*xr;
-	char			*cp;
 	size_t			 sz;
 
 	if (paths.sz == 0)
@@ -908,12 +909,12 @@ check_xr(void)
 		if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz))
 			continue;
 		if (xr->count == 1)
-			mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec);
+			mandoc_msg(MANDOCERR_XR_BAD, xr->line,
+			    xr->pos + 1, "Xr %s %s", xr->name, xr->sec);
 		else
-			mandoc_asprintf(&cp, "Xr %s %s (%d times)",
+			mandoc_msg(MANDOCERR_XR_BAD, xr->line,
+			    xr->pos + 1, "Xr %s %s (%d times)",
 			    xr->name, xr->sec, xr->count);
-		mandoc_msg(MANDOCERR_XR_BAD, NULL, xr->line, xr->pos + 1, cp);
-		free(cp);
 	}
 }