===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.202
retrieving revision 1.203
diff -c -r1.202 -r1.203
*** src/usr.bin/mandoc/main.c	2017/07/04 14:40:30	1.202
--- src/usr.bin/mandoc/main.c	2017/07/20 15:26:35	1.203
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.202 2017/07/04 14:40:30 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.203 2017/07/20 15:26:35 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2012, 2014-2017 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 105,110 ****
--- 105,111 ----
  static	char		  help_arg[] = "help";
  static	char		 *help_argv[] = {help_arg, NULL};
  static	enum mandoclevel  rc;
+ static	FILE		 *mmsg_stream;
  
  
  int
***************
*** 166,171 ****
--- 167,173 ----
  	curp.mmin = MANDOCERR_MAX;
  	curp.outopts = &conf.output;
  	options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;
+ 	mmsg_stream = stderr;
  
  	use_pager = 1;
  	tag_files = NULL;
***************
*** 964,969 ****
--- 966,972 ----
  	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"))
***************
*** 1053,1073 ****
  {
  	const char	*mparse_msg;
  
! 	fprintf(stderr, "%s: %s:", getprogname(),
  	    file == NULL ? "<stdin>" : file);
  
  	if (line)
! 		fprintf(stderr, "%d:%d:", line, col + 1);
  
! 	fprintf(stderr, " %s", mparse_strlevel(lvl));
  
  	if ((mparse_msg = mparse_strerror(t)) != NULL)
! 		fprintf(stderr, ": %s", mparse_msg);
  
  	if (msg)
! 		fprintf(stderr, ": %s", msg);
  
! 	fputc('\n', stderr);
  }
  
  static pid_t
--- 1056,1076 ----
  {
  	const char	*mparse_msg;
  
! 	fprintf(mmsg_stream, "%s: %s:", getprogname(),
  	    file == NULL ? "<stdin>" : file);
  
  	if (line)
! 		fprintf(mmsg_stream, "%d:%d:", line, col + 1);
  
! 	fprintf(mmsg_stream, " %s", mparse_strlevel(lvl));
  
  	if ((mparse_msg = mparse_strerror(t)) != NULL)
! 		fprintf(mmsg_stream, ": %s", mparse_msg);
  
  	if (msg)
! 		fprintf(mmsg_stream, ": %s", msg);
  
! 	fputc('\n', mmsg_stream);
  }
  
  static pid_t