Parse the new man.conf(5) "output" directive.

The next step will be to actually use the parsed data.

1 files changed, 96 insertions, 27 deletions

diff --git a/manpath.c b/manpath.c
index 5ff2d319..e7451597 100644
--- a/manpath.c
+++ b/manpath.c
@@ -1,4 +1,4 @@
-/*	$Id: manpath.c,v 1.22 2015/03/26 22:42:32 schwarze Exp $	*/
+/*	$Id: manpath.c,v 1.23 2015/03/27 17:37:25 schwarze Exp $	*/
 /*
  * Copyright (c) 2011, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -27,15 +27,15 @@
 #include <string.h>
 
 #include "mandoc_aux.h"
-#include "manpath.h"
-
-#define MAN_CONF_FILE	"/etc/man.conf"
+#include "manconf.h"
 
+static	void	 manconf_file(struct manconf *, const char *);
 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
@@ -88,11 +88,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;
 	}
 
@@ -103,23 +103,23 @@ 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);
-		if (dirs->sz == 0)
-			manpath_parseline(dirs, manpath_default, 0);
+		manconf_file(conf, file);
+		if (conf->manpath.sz == 0)
+			manpath_parseline(&conf->manpath, manpath_default, 0);
 		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;
 	}
 
@@ -127,14 +127,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
 }
 
@@ -192,20 +192,24 @@ 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)
+static void
+manconf_file(struct manconf *conf, const char *file)
 {
-	const char *const toks[] = { "manpath", "_whatdb" };
+	const char *const toks[] = { "manpath", "output", "_whatdb" };
 
 	FILE		*stream;
 	char		*cp, *ep;
@@ -237,7 +241,7 @@ manpath_manconf(struct manpaths *dirs, const char *file)
 		}
 
 		switch (tok) {
-		case 1:  /* _whatdb */
+		case 2:  /* _whatdb */
 			while (ep > cp && ep[-1] != '/')
 				ep--;
 			if (ep == cp)
@@ -245,7 +249,10 @@ manpath_manconf(struct manpaths *dirs, const char *file)
 			*ep = '\0';
 			/* FALLTHROUGH */
 		case 0:  /* manpath */
-			manpath_add(dirs, cp, 0);
+			manpath_add(&conf->manpath, cp, 0);
+			break;
+		case 1:  /* output */
+			manconf_output(&conf->output, cp);
 			break;
 		default:
 			break;
@@ -254,3 +261,65 @@ manpath_manconf(struct manpaths *dirs, const char *file)
 
 	fclose(stream);
 }
+
+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;
+	}
+}