From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from localhost (fantadrom.bsd.lv [local])
	by fantadrom.bsd.lv (OpenSMTPD) with ESMTPA id 94f88f6d
	for <source@mdocml.bsd.lv>;
	Wed, 15 Mar 2017 08:50:20 -0500 (EST)
Date: Wed, 15 Mar 2017 08:50:20 -0500 (EST)
Message-Id: <3796465809693640536.enqueue@fantadrom.bsd.lv>
X-Mailinglist: mdocml-source
Reply-To: source@mdocml.bsd.lv
MIME-Version: 1.0
From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: In URIs in apropos(1) result tables,  only write the manpath if 
X-Mailer: activitymail 1.26, http://search.cpan.org/dist/activitymail/
Content-Type: text/plain; charset=utf-8

Log Message:
-----------
In URIs in apropos(1) result tables, 
only write the manpath if it does not match the default.

Modified Files:
--------------
    mdocml:
        cgi.c

Revision Data
-------------
Index: cgi.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/cgi.c,v
retrieving revision 1.150
retrieving revision 1.151
diff -Lcgi.c -Lcgi.c -u -p -r1.150 -r1.151
--- cgi.c
+++ cgi.c
@@ -653,9 +653,12 @@ pg_searchres(const struct req *req, stru
 		for (i = 0; i < sz; i++) {
 			printf("  <tr>\n"
 			       "    <td>"
-			       "<a class=\"Xr\" href=\"/%s%s%s/%s\">",
-			    scriptname, *scriptname == '\0' ? "" : "/",
-			    req->q.manpath, r[i].file);
+			       "<a class=\"Xr\" href=\"/");
+			if (*scriptname != '\0')
+				printf("%s/", scriptname);
+			if (strcmp(req->q.manpath, req->p[0]))
+				printf("%s/", req->q.manpath);
+			printf("%s\">", r[i].file);
 			html_print(r[i].names);
 			printf("</a></td>\n"
 			       "    <td><span class=\"Nd\">");
--
 To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv