Actually use the new man.conf(5) "output" directive.

Additional functionality, yet minus 45 lines of code.

1 files changed, 8 insertions, 7 deletions

diff --git a/cgi.c b/cgi.c
index a482ffac..402be8f9 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,7 +1,7 @@
-/*	$Id: cgi.c,v 1.105 2015/03/27 17:37:25 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.106 2015/03/27 21:33:20 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
- * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
+ * Copyright (c) 2014, 2015 Ingo Schwarze <schwarze@usta.de>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -816,12 +816,12 @@ catman(const struct req *req, const char *file)
 static void
 format(const struct req *req, const char *file)
 {
+	struct manoutput conf;
 	struct mparse	*mp;
 	struct mchars	*mchars;
 	struct mdoc	*mdoc;
 	struct man	*man;
 	void		*vp;
-	char		*opts;
 	int		 fd;
 	int		 usepath;
 
@@ -836,9 +836,10 @@ format(const struct req *req, const char *file)
 	mparse_readfd(mp, fd, file);
 	close(fd);
 
+	memset(&conf, 0, sizeof(conf));
+	conf.fragment = 1;
 	usepath = strcmp(req->q.manpath, req->p[0]);
-	mandoc_asprintf(&opts,
-	    "fragment,man=%s?query=%%N&sec=%%S%s%s%s%s",
+	mandoc_asprintf(&conf.man, "%s?query=%%N&sec=%%S%s%s%s%s",
 	    scriptname,
 	    req->q.arch	? "&arch="       : "",
 	    req->q.arch	? req->q.arch    : "",
@@ -855,7 +856,7 @@ format(const struct req *req, const char *file)
 		return;
 	}
 
-	vp = html_alloc(mchars, opts);
+	vp = html_alloc(mchars, &conf);
 
 	if (NULL != mdoc)
 		html_mdoc(vp, mdoc);
@@ -865,7 +866,7 @@ format(const struct req *req, const char *file)
 	html_free(vp);
 	mparse_free(mp);
 	mchars_free(mchars);
-	free(opts);
+	free(conf.man);
 }
 
 static void