1 files changed, 157 insertions, 58 deletions

diff --git a/contrib/mdocml/manpath.c b/contrib/mdocml/manpath.c
index e85175e..0627f13 100644
--- a/contrib/mdocml/manpath.c
+++ b/contrib/mdocml/manpath.c
@@ -1,15 +1,15 @@
-/*	$Id: manpath.c,v 1.19 2014/11/27 00:30:40 schwarze Exp $ */
+/*	$Id: manpath.c,v 1.29 2015/11/07 17:58:55 schwarze Exp $	*/
 /*
- * Copyright (c) 2011, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
  * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
  * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
@@ -20,24 +20,27 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 
-#include <assert.h>
 #include <ctype.h>
+#if HAVE_ERR
+#include <err.h>
+#endif
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "mandoc_aux.h"
-#include "manpath.h"
-
-#define MAN_CONF_FILE	"/etc/man.conf"
-#define MAN_CONF_KEY	"_whatdb"
+#include "manconf.h"
 
+#if !HAVE_MANPATH
+static	void	 manconf_file(struct manconf *, const char *);
+#endif
 static	void	 manpath_add(struct manpaths *, const char *, int);
 static	void	 manpath_parseline(struct manpaths *, char *, int);
 
+
 void
-manpath_parse(struct manpaths *dirs, const char *file,
+manconf_parse(struct manconf *conf, const char *file,
 		char *defp, char *auxp)
 {
 #if HAVE_MANPATH
@@ -80,7 +83,7 @@ manpath_parse(struct manpaths *dirs, const char *file,
 	if ( ! ferror(stream) && feof(stream) &&
 			bsz && '\n' == buf[bsz - 1]) {
 		buf[bsz - 1] = '\0';
-		manpath_parseline(dirs, buf, 1);
+		manpath_parseline(&conf->manpath, buf, 1);
 	}
 
 	free(buf);
@@ -89,11 +92,11 @@ manpath_parse(struct manpaths *dirs, const char *file,
 	char		*insert;
 
 	/* Always prepend -m. */
-	manpath_parseline(dirs, auxp, 1);
+	manpath_parseline(&conf->manpath, auxp, 1);
 
 	/* If -M is given, it overrides everything else. */
 	if (NULL != defp) {
-		manpath_parseline(dirs, defp, 1);
+		manpath_parseline(&conf->manpath, defp, 1);
 		return;
 	}
 
@@ -104,21 +107,21 @@ manpath_parse(struct manpaths *dirs, const char *file,
 
 	/* No MANPATH; use man.conf(5) only. */
 	if (NULL == defp || '\0' == defp[0]) {
-		manpath_manconf(dirs, file);
+		manconf_file(conf, file);
 		return;
 	}
 
 	/* Prepend man.conf(5) to MANPATH. */
 	if (':' == defp[0]) {
-		manpath_manconf(dirs, file);
-		manpath_parseline(dirs, 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(dirs, defp, 0);
-		manpath_manconf(dirs, file);
+		manpath_parseline(&conf->manpath, defp, 0);
+		manconf_file(conf, file);
 		return;
 	}
 
@@ -126,14 +129,14 @@ manpath_parse(struct manpaths *dirs, const char *file,
 	insert = strstr(defp, "::");
 	if (NULL != insert) {
 		*insert++ = '\0';
-		manpath_parseline(dirs, defp, 0);
-		manpath_manconf(dirs, file);
-		manpath_parseline(dirs, insert + 1, 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(dirs, defp, 0);
+	manpath_parseline(&conf->manpath, defp, 0);
 #endif
 }
 
@@ -165,10 +168,8 @@ manpath_add(struct manpaths *dirs, const char *dir, int complain)
 	size_t		 i;
 
 	if (NULL == (cp = realpath(dir, buf))) {
-		if (complain) {
-			fputs("manpath: ", stderr);
-			perror(dir);
-		}
+		if (complain)
+			warn("manpath: %s", dir);
 		return;
 	}
 
@@ -177,10 +178,8 @@ manpath_add(struct manpaths *dirs, const char *dir, int complain)
 			return;
 
 	if (stat(cp, &sb) == -1) {
-		if (complain) {
-			fputs("manpath: ", stderr);
-			perror(dir);
-		}
+		if (complain)
+			warn("manpath: %s", dir);
 		return;
 	}
 
@@ -191,47 +190,147 @@ manpath_add(struct manpaths *dirs, const char *dir, int complain)
 }
 
 void
-manpath_free(struct manpaths *p)
+manconf_free(struct manconf *conf)
 {
 	size_t		 i;
 
-	for (i = 0; i < p->sz; i++)
-		free(p->paths[i]);
+	for (i = 0; i < conf->manpath.sz; i++)
+		free(conf->manpath.paths[i]);
 
-	free(p->paths);
+	free(conf->manpath.paths);
+	free(conf->output.includes);
+	free(conf->output.man);
+	free(conf->output.paper);
+	free(conf->output.style);
 }
 
-void
-manpath_manconf(struct manpaths *dirs, const char *file)
+#if !HAVE_MANPATH
+static void
+manconf_file(struct manconf *conf, const char *file)
 {
+	const char *const toks[] = { "manpath", "output", "_whatdb" };
+	char manpath_default[] = MANPATH_DEFAULT;
+
 	FILE		*stream;
-	char		*p, *q;
-	size_t		 len, keysz;
+	char		*line, *cp, *ep;
+	size_t		 linesz, tok, toklen;
+	ssize_t		 linelen;
 
-	keysz = strlen(MAN_CONF_KEY);
-	assert(keysz > 0);
+	if ((stream = fopen(file, "r")) == NULL)
+		goto out;
 
-	if (NULL == (stream = fopen(file, "r")))
-		return;
+	line = NULL;
+	linesz = 0;
 
-	while (NULL != (p = fgetln(stream, &len))) {
-		if (0 == len || '\n' != p[--len])
+	while ((linelen = getline(&line, &linesz, stream)) != -1) {
+		cp = line;
+		ep = cp + linelen;
+		if (ep[-1] != '\n')
 			break;
-		p[len] = '\0';
-		while (isspace((unsigned char)*p))
-			p++;
-		if (strncmp(MAN_CONF_KEY, p, keysz))
-			continue;
-		p += keysz;
-		while (isspace((unsigned char)*p))
-			p++;
-		if ('\0' == *p)
+		*--ep = '\0';
+		while (isspace((unsigned char)*cp))
+			cp++;
+		if (*cp == '#')
 			continue;
-		if (NULL == (q = strrchr(p, '/')))
-			continue;
-		*q = '\0';
-		manpath_add(dirs, p, 0);
-	}
 
+		for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) {
+			toklen = strlen(toks[tok]);
+			if (cp + toklen < ep &&
+			    isspace((unsigned char)cp[toklen]) &&
+			    strncmp(cp, toks[tok], toklen) == 0) {
+				cp += toklen;
+				while (isspace((unsigned char)*cp))
+					cp++;
+				break;
+			}
+		}
+
+		switch (tok) {
+		case 2:  /* _whatdb */
+			while (ep > cp && ep[-1] != '/')
+				ep--;
+			if (ep == cp)
+				continue;
+			*ep = '\0';
+			/* FALLTHROUGH */
+		case 0:  /* manpath */
+			manpath_add(&conf->manpath, cp, 0);
+			*manpath_default = '\0';
+			break;
+		case 1:  /* output */
+			manconf_output(&conf->output, cp);
+			break;
+		default:
+			break;
+		}
+	}
+	free(line);
 	fclose(stream);
+
+out:
+	if (*manpath_default != '\0')
+		manpath_parseline(&conf->manpath, manpath_default, 0);
+}
+#endif
+
+void
+manconf_output(struct manoutput *conf, const char *cp)
+{
+	const char *const toks[] = {
+	    "includes", "man", "paper", "style",
+	    "indent", "width", "fragment", "mdoc"
+	};
+
+	size_t	 len, tok;
+
+	for (tok = 0; tok < sizeof(toks)/sizeof(toks[0]); tok++) {
+		len = strlen(toks[tok]);
+		if ( ! strncmp(cp, toks[tok], len) &&
+		    strchr(" =	", cp[len]) != NULL) {
+			cp += len;
+			if (*cp == '=')
+				cp++;
+			while (isspace((unsigned char)*cp))
+				cp++;
+			break;
+		}
+	}
+
+	if (tok < 6 && *cp == '\0')
+		return;
+
+	switch (tok) {
+	case 0:
+		if (conf->includes == NULL)
+			conf->includes = mandoc_strdup(cp);
+		break;
+	case 1:
+		if (conf->man == NULL)
+			conf->man = mandoc_strdup(cp);
+		break;
+	case 2:
+		if (conf->paper == NULL)
+			conf->paper = mandoc_strdup(cp);
+		break;
+	case 3:
+		if (conf->style == NULL)
+			conf->style = mandoc_strdup(cp);
+		break;
+	case 4:
+		if (conf->indent == 0)
+			conf->indent = strtonum(cp, 0, 1000, NULL);
+		break;
+	case 5:
+		if (conf->width == 0)
+			conf->width = strtonum(cp, 58, 1000, NULL);
+		break;
+	case 6:
+		conf->fragment = 1;
+		break;
+	case 7:
+		conf->mdoc = 1;
+		break;
+	default:
+		break;
+	}
 }