===================================================================
RCS file: /cvs/mandoc/mansearch.c,v
retrieving revision 1.46
retrieving revision 1.49
diff -u -p -r1.46 -r1.49
--- mandoc/mansearch.c	2014/08/21 20:29:07	1.46
+++ mandoc/mansearch.c	2014/11/11 19:04:55	1.49
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.c,v 1.46 2014/08/21 20:29:07 schwarze Exp $ */
+/*	$Id: mansearch.c,v 1.49 2014/11/11 19:04:55 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -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 *,
@@ -335,6 +335,7 @@ mansearch(const struct mansearch *search,
 				    maxres, sizeof(struct manpage));
 			}
 			mpage = *res + cur;
+			mpage->ipath = i;
 			mpage->sec = 10;
 			mpage->form = mp->form;
 			buildnames(mpage, db, s, mp->pageid,
@@ -351,6 +352,14 @@ mansearch(const struct mansearch *search,
 		sqlite3_finalize(s2);
 		sqlite3_close(db);
 		ohash_delete(&htab);
+
+		/*
+		 * In man(1) mode, prefer matches in earlier trees
+		 * over matches in later trees.
+		 */
+
+		if (cur && search->firstmatch)
+			break;
 	}
 	qsort(*res, cur, sizeof(struct manpage), manpage_compare);
 	rc = 1;
@@ -397,6 +406,7 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3
 {
 	char		*newnames, *prevsec, *prevarch;
 	const char	*oldnames, *sep1, *name, *sec, *sep2, *arch, *fsec;
+	const char	*gzip;
 	size_t		 i;
 	int		 c;
 
@@ -462,16 +472,20 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3
 		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));