From: schwarze <schwarze@openbsd.org>
Date: Sun, 31 Jul 2016 23:35:26 +0000 (+0000)
Subject: Some base system pages, for example perl(1), contain non-ASCII
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=f139d5f6d02a578b8057d7624901c2cc37c78adb;p=openbsd

Some base system pages, for example perl(1), contain non-ASCII
characters in their source code, so switch on charset autodetection
in the same way as in man(1) itself.
Issue reported by Pavan Maddamsetti at gmail dot com on bugs@.
---

diff --git a/usr.bin/mandoc/cgi.c b/usr.bin/mandoc/cgi.c
index 79b42e6add4..19d15700910 100644
--- a/usr.bin/mandoc/cgi.c
+++ b/usr.bin/mandoc/cgi.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cgi.c,v 1.74 2016/07/11 22:46:57 schwarze Exp $ */
+/*	$OpenBSD: cgi.c,v 1.75 2016/07/31 23:35:26 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2016 Ingo Schwarze <schwarze@usta.de>
@@ -798,7 +798,8 @@ resp_format(const struct req *req, const char *file)
 	}
 
 	mchars_alloc();
-	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, req->q.manpath);
+	mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1,
+	    MANDOCLEVEL_BADARG, NULL, req->q.manpath);
 	mparse_readfd(mp, fd, file);
 	close(fd);