aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/cgi.c
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2014-07-25 17:52:04 +0000
committerIngo Schwarze <schwarze@openbsd.org>2014-07-25 17:52:04 +0000
commitffcf48b062f6f37207d6e3bbbcd46a6b30c7ebcc (patch)
treef61009a8f832a1319b0d424110f183b04f321860 /cgi.c
parent769efc0422e582188cc5981492f486d5df5dc98b (diff)
downloadmandoc-ffcf48b062f6f37207d6e3bbbcd46a6b30c7ebcc.tar.gz
mandoc-ffcf48b062f6f37207d6e3bbbcd46a6b30c7ebcc.tar.zst
mandoc-ffcf48b062f6f37207d6e3bbbcd46a6b30c7ebcc.zip
In generated .Xr links, avoid double encoding of ampersands
and avoid empty arch= keys.
Diffstat (limited to 'cgi.c')
-rw-r--r--cgi.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/cgi.c b/cgi.c
index d219f307..ed69a7bb 100644
--- a/cgi.c
+++ b/cgi.c
@@ -1,4 +1,4 @@
-/* $Id: cgi.c,v 1.86 2014/07/25 17:34:06 schwarze Exp $ */
+/* $Id: cgi.c,v 1.87 2014/07/25 17:52:04 schwarze Exp $ */
/*
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
* Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -874,8 +874,9 @@ format(const struct req *req, const char *file)
}
snprintf(opts, sizeof(opts), "fragment,man=%s?"
- "manpath=%s&amp;query=%%N&amp;sec=%%S&amp;arch=%s",
+ "manpath=%s&query=%%N&sec=%%S%s%s",
scriptname, req->q.manpath,
+ req->q.arch ? "&arch=" : "",
req->q.arch ? req->q.arch : "");
mparse_result(mp, &mdoc, &man, NULL);