include manpath= when printing queries, and omit empty parameters

1 files changed, 32 insertions, 12 deletions

diff --git a/cgi.c b/cgi.c
index 3d329308..424b99de 100644
--- a/cgi.c
+++ b/cgi.c
@@ -134,12 +134,22 @@ static void
 http_printquery(const struct req *req)
 {
 
-	printf("&expr=");
-	http_print(req->q.expr ? req->q.expr : "");
-	printf("&sec=");
-	http_print(req->q.sec ? req->q.sec : "");
-	printf("&arch=");
-	http_print(req->q.arch ? req->q.arch : "");
+	if (NULL != req->q.manroot) {
+		printf("&manpath=");
+		http_print(req->q.manroot);
+	}
+	if (NULL != req->q.sec) {
+		printf("&sec=");
+		http_print(req->q.sec);
+	}
+	if (NULL != req->q.arch) {
+		printf("&arch=");
+		http_print(req->q.arch);
+	}
+	if (NULL != req->q.expr) {
+		printf("&expr=");
+		http_print(req->q.expr ? req->q.expr : "");
+	}
 }
 
 
@@ -147,12 +157,22 @@ static void
 html_printquery(const struct req *req)
 {
 
-	printf("&expr=");
-	html_print(req->q.expr ? req->q.expr : "");
-	printf("&sec=");
-	html_print(req->q.sec ? req->q.sec : "");
-	printf("&arch=");
-	html_print(req->q.arch ? req->q.arch : "");
+	if (NULL != req->q.manroot) {
+		printf("&manpath=");
+		html_print(req->q.manroot);
+	}
+	if (NULL != req->q.sec) {
+		printf("&sec=");
+		html_print(req->q.sec);
+	}
+	if (NULL != req->q.arch) {
+		printf("&arch=");
+		html_print(req->q.arch);
+	}
+	if (NULL != req->q.expr) {
+		printf("&expr=");
+		html_print(req->q.expr ? req->q.expr : "");
+	}
 }
 
 static void