===================================================================
RCS file: /cvs/mandoc/manpath.c,v
retrieving revision 1.6
retrieving revision 1.10
diff -u -p -r1.6 -r1.10
--- mandoc/manpath.c	2011/12/13 20:56:46	1.6
+++ mandoc/manpath.c	2013/05/29 22:48:10	1.10
@@ -1,4 +1,4 @@
-/*	$Id: manpath.c,v 1.6 2011/12/13 20:56:46 kristaps Exp $ */
+/*	$Id: manpath.c,v 1.10 2013/05/29 22:48:10 schwarze Exp $ */
 /*
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -19,7 +19,9 @@
 #include "config.h"
 #endif
 
+#ifdef	USE_MANPATH
 #include <sys/param.h>
+#endif
 
 #include <assert.h>
 #include <ctype.h>
@@ -63,7 +65,6 @@ manpath_parse(struct manpaths *dirs, const char *file,
 
 	/* Open manpath(1).  Ignore errors. */
 
-	warnx(cmd);
 	stream = popen(cmd, "r");
 	if (NULL == stream)
 		return;
@@ -75,7 +76,7 @@ manpath_parse(struct manpaths *dirs, const char *file,
 
 	do {
 		buf = mandoc_realloc(buf, bsz + 1024);
-		sz = fread(buf + (int)bsz, 1, 1024, stream);
+		sz = fread(buf + bsz, 1, 1024, stream);
 		bsz += sz;
 	} while (sz > 0);
 
@@ -88,15 +89,54 @@ manpath_parse(struct manpaths *dirs, const char *file,
 	free(buf);
 	pclose(stream);
 #else
+	char		*insert;
+
+	/* Always prepend -m. */
 	manpath_parseline(dirs, auxp);
 
-	if (NULL == defp)
-		defp = getenv("MANPATH");
+	/* If -M is given, it overrides everything else. */
+	if (NULL != defp) {
+		manpath_parseline(dirs, defp);
+		return;
+	}
 
-	if (NULL == defp)
-		manpath_manconf(dirs, file ? file : MAN_CONF_FILE);
-	else
+	/* MANPATH and man.conf(5) cooperate. */
+	defp = getenv("MANPATH");
+	if (NULL == file)
+		file = MAN_CONF_FILE;
+
+	/* No MANPATH; use man.conf(5) only. */
+	if (NULL == defp || '\0' == defp[0]) {
+		manpath_manconf(dirs, file);
+		return;
+	}
+
+	/* Prepend man.conf(5) to MANPATH. */
+	if (':' == defp[0]) {
+		manpath_manconf(dirs, file);
 		manpath_parseline(dirs, defp);
+		return;
+	}
+
+	/* Append man.conf(5) to MANPATH. */
+	if (':' == defp[strlen(defp) - 1]) {
+		manpath_parseline(dirs, defp);
+		manpath_manconf(dirs, file);
+		return;
+	}
+
+	/* Insert man.conf(5) into MANPATH. */
+	insert = strstr(defp, "::");
+	if (NULL != insert) {
+		*insert++ = '\0';
+		manpath_parseline(dirs, defp);
+		manpath_manconf(dirs, file);
+		manpath_parseline(dirs, insert + 1);
+		return;
+	}
+
+	/* MANPATH overrides man.conf(5) completely. */
+	manpath_parseline(dirs, defp);
 #endif
 }
 
@@ -124,7 +164,7 @@ manpath_add(struct manpaths *dirs, const char *dir)
 {
 	char		 buf[PATH_MAX];
 	char		*cp;
-	int		 i;
+	size_t		 i;
 
 	if (NULL == (cp = realpath(dir, buf)))
 		return;
@@ -135,7 +175,7 @@ manpath_add(struct manpaths *dirs, const char *dir)
 
 	dirs->paths = mandoc_realloc
 		(dirs->paths,
-		 ((size_t)dirs->sz + 1) * sizeof(char *));
+		 (dirs->sz + 1) * sizeof(char *));
 
 	dirs->paths[dirs->sz++] = mandoc_strdup(cp);
 }
@@ -143,7 +183,7 @@ manpath_add(struct manpaths *dirs, const char *dir)
 void
 manpath_free(struct manpaths *p)
 {
-	int		 i;
+	size_t		 i;
 
 	for (i = 0; i < p->sz; i++)
 		free(p->paths[i]);