===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.315
retrieving revision 1.319
diff -u -p -r1.315 -r1.319
--- mandoc/main.c	2018/12/30 00:49:55	1.315
+++ mandoc/main.c	2019/03/03 13:02:11	1.319
@@ -1,7 +1,7 @@
-/*	$Id: main.c,v 1.315 2018/12/30 00:49:55 schwarze Exp $ */
+/*	$Id: main.c,v 1.319 2019/03/03 13:02:11 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2010-2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010-2012, 2014-2019 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
@@ -123,7 +123,7 @@ main(int argc, char *argv[])
 	struct manpage	*res, *resp;
 	const char	*progname, *sec, *thisarg;
 	char		*conf_file, *defpaths, *auxpaths;
-	char		*oarg;
+	char		*oarg, *tagarg;
 	unsigned char	*uc;
 	size_t		 i, sz;
 	int		 prio, best_prio;
@@ -148,6 +148,7 @@ main(int argc, char *argv[])
 	setprogname(progname);
 #endif
 
+	mandoc_msg_setoutfile(stderr);
 	if (strncmp(progname, "mandocdb", 8) == 0 ||
 	    strcmp(progname, BINM_MAKEWHATIS) == 0)
 		return mandocdb(argc, argv);
@@ -368,6 +369,17 @@ main(int argc, char *argv[])
 #endif
 	}
 
+	/*
+	 * Use the first argument for -O tag in addition to
+	 * using it as a search term for man(1) or apropos(1).
+	 */
+
+	if (conf.output.tag != NULL && *conf.output.tag == '\0') {
+		tagarg = argc > 0 && search.argmode == ARG_EXPR ?
+		    strchr(*argv, '=') : NULL;
+		conf.output.tag = tagarg == NULL ? *argv : tagarg + 1;
+	}
+
 	/* man(1), whatis(1), apropos(1) */
 
 	if (search.argmode != ARG_FILE) {
@@ -480,8 +492,10 @@ main(int argc, char *argv[])
 	curp.mp = mparse_alloc(options, curp.os_e, curp.os_s);
 
 	if (argc < 1) {
-		if (use_pager)
+		if (use_pager) {
 			tag_files = tag_init();
+			tag_files->tagname = conf.output.tag;
+		}
 		thisarg = "<stdin>";
 		mandoc_msg_setinfilename(thisarg);
 		parse(&curp, STDIN_FILENO, thisarg);
@@ -518,11 +532,7 @@ main(int argc, char *argv[])
 			if (use_pager) {
 				use_pager = 0;
 				tag_files = tag_init();
-				if (conf.output.tag != NULL &&
-				    tag_files->tagname == NULL)
-					tag_files->tagname =
-					    *conf.output.tag != '\0' ?
-					    conf.output.tag : *argv;
+				tag_files->tagname = conf.output.tag;
 			}
 
 			mandoc_msg_setinfilename(thisarg);
@@ -551,7 +561,7 @@ main(int argc, char *argv[])
 			}
 		} else
 			mandoc_msg(MANDOCERR_FILE, 0, 0,
-			    "%s", strerror(errno));
+			    "%s: %s", thisarg, strerror(errno));
 
 		if (curp.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK)
 			break;
@@ -825,6 +835,8 @@ parse(struct curparse *curp, int fd, const char *file)
 
 	if (curp->outdata == NULL)
 		outdata_alloc(curp);
+	else if (curp->outtype == OUTT_HTML)
+		html_reset(curp);
 
 	mandoc_xr_reset();
 	meta = mparse_result(curp->mp);