If a manual page is installed gzip(1)ed, let makewhatis(8) take

note in mandoc.db(5), such that man(1) -w and apropos(1) -w can
report the correct filename.
This is a prerequisite for letting apropos -a and man support
gzip'ed manuals in the future, which doesn't work yet.

1 files changed, 9 insertions, 4 deletions

diff --git a/mansearch.c b/mansearch.c
index 4455dc11..1d94937c 100644
--- a/mansearch.c
+++ b/mansearch.c
@@ -80,7 +80,7 @@ struct	expr {
 struct	match {
 	uint64_t	 pageid; /* identifier in database */
 	char		*desc; /* manual page description */
-	int		 form; /* 0 == catpage */
+	int		 form; /* bit field: formatted, zipped? */
 };
 
 static	void		 buildnames(struct manpage *, sqlite3 *,
@@ -398,6 +398,7 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
 {
 	char		*newnames, *prevsec, *prevarch;
 	const char	*oldnames, *sep1, *name, *sec, *sep2, *arch, *fsec;
+	const char	*gzip;
 	size_t		 i;
 	int		 c;
 
@@ -463,16 +464,20 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
 		if (NULL != mpage->file)
 			continue;
 
-		if (form) {
+		if (form & FORM_SRC) {
 			sep1 = "man";
 			fsec = sec;
 		} else {
 			sep1 = "cat";
 			fsec = "0";
 		}
+		if (form & FORM_GZ)
+			gzip = ".gz";
+		else
+			gzip = "";
 		sep2 = '\0' == *arch ? "" : "/";
-		mandoc_asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s",
-		    path, sep1, sec, sep2, arch, name, fsec);
+		mandoc_asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s%s",
+		    path, sep1, sec, sep2, arch, name, fsec, gzip);
 	}
 	if (SQLITE_DONE != c)
 		fprintf(stderr, "%s\n", sqlite3_errmsg(db));