===================================================================
RCS file: /cvs/mandoc/manpath.c,v
retrieving revision 1.41
retrieving revision 1.44
diff -u -p -r1.41 -r1.44
--- mandoc/manpath.c	2020/02/10 14:42:10	1.41
+++ mandoc/manpath.c	2021/11/05 18:03:08	1.44
@@ -1,4 +1,4 @@
-/*	$Id: manpath.c,v 1.41 2020/02/10 14:42:10 schwarze Exp $ */
+/*	$Id: manpath.c,v 1.44 2021/11/05 18:03:08 schwarze Exp $ */
 /*
  * Copyright (c) 2011,2014,2015,2017-2019 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -31,63 +31,51 @@
 #include "mandoc.h"
 #include "manconf.h"
 
-static	void	 manconf_file(struct manconf *, const char *);
+static	void	 manconf_file(struct manconf *, const char *, int);
 static	void	 manpath_add(struct manpaths *, const char *, char);
 static	void	 manpath_parseline(struct manpaths *, char *, char);
 
 
 void
-manconf_parse(struct manconf *conf, const char *file,
-		char *defp, char *auxp)
+manconf_parse(struct manconf *conf, const char *file, char *pend, char *pbeg)
 {
-	char		*insert;
+	int use_path_from_file = 1;
 
 	/* Always prepend -m. */
-	manpath_parseline(&conf->manpath, auxp, 'm');
+	manpath_parseline(&conf->manpath, pbeg, 'm');
 
-	/* If -M is given, it overrides everything else. */
-	if (NULL != defp) {
-		manpath_parseline(&conf->manpath, defp, 'M');
-		return;
+	if (pend != NULL && *pend != '\0') {
+		/* If -M is given, it overrides everything else. */
+		manpath_parseline(&conf->manpath, pend, 'M');
+		use_path_from_file = 0;
+		pbeg = pend = NULL;
+	} else if ((pbeg = getenv("MANPATH")) == NULL || *pbeg == '\0') {
+		/* No MANPATH; use man.conf(5) only. */
+		pbeg = pend = NULL;
+	} else if (*pbeg == ':') {
+		/* Prepend man.conf(5) to MANPATH. */
+		pend = pbeg + 1;
+		pbeg = NULL;
+	} else if ((pend = strstr(pbeg, "::")) != NULL) {
+		/* Insert man.conf(5) into MANPATH. */
+		*pend = '\0';
+		pend += 2;
+	} else if (pbeg[strlen(pbeg) - 1] == ':') {
+		/* Append man.conf(5) to MANPATH. */
+		pend = NULL;
+	} else {
+		/* MANPATH overrides man.conf(5) completely. */
+		use_path_from_file = 0;
+		pend = NULL;
 	}
 
-	/* MANPATH and man.conf(5) cooperate. */
-	defp = getenv("MANPATH");
-	if (NULL == file)
+	manpath_parseline(&conf->manpath, pbeg, '\0');
+
+	if (file == NULL)
 		file = MAN_CONF_FILE;
+	manconf_file(conf, file, use_path_from_file);
 
-	/* No MANPATH; use man.conf(5) only. */
-	if (NULL == defp || '\0' == defp[0]) {
-		manconf_file(conf, file);
-		return;
-	}
-
-	/* Prepend man.conf(5) to MANPATH. */
-	if (':' == defp[0]) {
-		manconf_file(conf, file);
-		manpath_parseline(&conf->manpath, defp, '\0');
-		return;
-	}
-
-	/* Append man.conf(5) to MANPATH. */
-	if (':' == defp[strlen(defp) - 1]) {
-		manpath_parseline(&conf->manpath, defp, '\0');
-		manconf_file(conf, file);
-		return;
-	}
-
-	/* Insert man.conf(5) into MANPATH. */
-	insert = strstr(defp, "::");
-	if (NULL != insert) {
-		*insert++ = '\0';
-		manpath_parseline(&conf->manpath, defp, '\0');
-		manconf_file(conf, file);
-		manpath_parseline(&conf->manpath, insert + 1, '\0');
-		return;
-	}
-
-	/* MANPATH overrides man.conf(5) completely. */
-	manpath_parseline(&conf->manpath, defp, '\0');
+	manpath_parseline(&conf->manpath, pend, '\0');
 }
 
 void
@@ -161,7 +149,7 @@ manconf_free(struct manconf *conf)
 }
 
 static void
-manconf_file(struct manconf *conf, const char *file)
+manconf_file(struct manconf *conf, const char *file, int use_path_from_file)
 {
 	const char *const toks[] = { "manpath", "output" };
 	char manpath_default[] = MANPATH_DEFAULT;
@@ -201,7 +189,8 @@ manconf_file(struct manconf *conf, const char *file)
 
 		switch (tok) {
 		case 0:  /* manpath */
-			manpath_add(&conf->manpath, cp, '\0');
+			if (use_path_from_file)
+				manpath_add(&conf->manpath, cp, '\0');
 			*manpath_default = '\0';
 			break;
 		case 1:  /* output */
@@ -215,7 +204,7 @@ manconf_file(struct manconf *conf, const char *file)
 	fclose(stream);
 
 out:
-	if (*manpath_default != '\0')
+	if (use_path_from_file && *manpath_default != '\0')
 		manpath_parseline(&conf->manpath, manpath_default, '\0');
 }
 
@@ -223,8 +212,13 @@ int
 manconf_output(struct manoutput *conf, const char *cp, int fromfile)
 {
 	const char *const toks[] = {
+	    /* Tokens requiring an argument. */
 	    "includes", "man", "paper", "style", "indent", "width",
-	    "tag", "fragment", "mdoc", "noval", "toc"
+	    "outfilename", "tagfilename",
+	    /* Token taking an optional argument. */
+	    "tag",
+	    /* Tokens not taking arguments. */
+	    "fragment", "mdoc", "noval", "toc"
 	};
 	const size_t ntoks = sizeof(toks) / sizeof(toks[0]);
 
@@ -245,11 +239,11 @@ manconf_output(struct manoutput *conf, const char *cp,
 		}
 	}
 
-	if (tok < 6 && *cp == '\0') {
+	if (tok < 8 && *cp == '\0') {
 		mandoc_msg(MANDOCERR_BADVAL_MISS, 0, 0, "-O %s=?", toks[tok]);
 		return -1;
 	}
-	if (tok > 6 && tok < ntoks && *cp != '\0') {
+	if (tok > 8 && tok < ntoks && *cp != '\0') {
 		mandoc_msg(MANDOCERR_BADVAL, 0, 0, "-O %s=%s", toks[tok], cp);
 		return -1;
 	}
@@ -306,22 +300,40 @@ manconf_output(struct manoutput *conf, const char *cp,
 		    "-O width=%s is %s", cp, errstr);
 		return -1;
 	case 6:
+		if (conf->outfilename != NULL) {
+			oldval = mandoc_strdup(conf->outfilename);
+			break;
+		}
+		conf->outfilename = mandoc_strdup(cp);
+		return 0;
+	case 7:
+		if (conf->tagfilename != NULL) {
+			oldval = mandoc_strdup(conf->tagfilename);
+			break;
+		}
+		conf->tagfilename = mandoc_strdup(cp);
+		return 0;
+	/*
+	 * If the index of the following token changes,
+	 * do not forget to adjust the range check above the switch.
+	 */
+	case 8:
 		if (conf->tag != NULL) {
 			oldval = mandoc_strdup(conf->tag);
 			break;
 		}
 		conf->tag = mandoc_strdup(cp);
 		return 0;
-	case 7:
+	case 9:
 		conf->fragment = 1;
 		return 0;
-	case 8:
+	case 10:
 		conf->mdoc = 1;
 		return 0;
-	case 9:
+	case 11:
 		conf->noval = 1;
 		return 0;
-	case 10:
+	case 12:
 		conf->toc = 1;
 		return 0;
 	default: