Make the character table available to libroff so it can check the

validity of character escape names and warn about unknown ones.
This requires mchars_spec2cp() to report unknown names again.
Fortunately, that doesn't require changing the calling code because
according to groff, invalid character escapes should not produce
output anyway, and now that we warn about them, that's fine.

1 files changed, 7 insertions, 3 deletions

diff --git a/cgi.c b/cgi.c
index 4cb4fa92..f09aaf67 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.99 2014/10/07 18:20:06 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.100 2014/10/28 17:36:19 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -824,6 +824,7 @@ static void
 format(const struct req *req, const char *file)
 {
 	struct mparse	*mp;
+	struct mchars	*mchars;
 	struct mdoc	*mdoc;
 	struct man	*man;
 	void		*vp;
@@ -837,8 +838,9 @@ format(const struct req *req, const char *file)
 		return;
 	}
 
+	mchars = mchars_alloc();
 	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
-	    req->q.manpath);
+	    mchars, req->q.manpath);
 	rc = mparse_readfd(mp, fd, file);
 	close(fd);
 
@@ -864,10 +866,11 @@ format(const struct req *req, const char *file)
 		    req->q.manpath, file);
 		pg_error_internal();
 		mparse_free(mp);
+		mchars_free(mchars);
 		return;
 	}
 
-	vp = html_alloc(opts);
+	vp = html_alloc(mchars, opts);
 
 	if (NULL != mdoc)
 		html_mdoc(vp, mdoc);
@@ -876,6 +879,7 @@ format(const struct req *req, const char *file)
 
 	html_free(vp);
 	mparse_free(mp);
+	mchars_free(mchars);
 	free(opts);
 }