===================================================================
RCS file: /cvs/mandoc/mansearch.c,v
retrieving revision 1.20
retrieving revision 1.25
diff -u -p -r1.20 -r1.25
--- mandoc/mansearch.c	2014/01/19 01:18:34	1.20
+++ mandoc/mansearch.c	2014/03/28 19:17:12	1.25
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.c,v 1.20 2014/01/19 01:18:34 schwarze Exp $ */
+/*	$Id: mansearch.c,v 1.25 2014/03/28 19:17:12 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -39,6 +39,7 @@
 #include <sqlite3.h>
 
 #include "mandoc.h"
+#include "mandoc_aux.h"
 #include "manpath.h"
 #include "mansearch.h"
 
@@ -254,7 +255,8 @@ mansearch(const struct mansearch *search,
 		sqlite3_finalize(s);
 
 		c = sqlite3_prepare_v2(db, 
-		    "SELECT * FROM mlinks WHERE pageid=?",
+		    "SELECT * FROM mlinks WHERE pageid=?"
+		    " ORDER BY sec, arch, name",
 		    -1, &s, NULL);
 		if (SQLITE_OK != c)
 			fprintf(stderr, "%s\n", sqlite3_errmsg(db));
@@ -303,17 +305,19 @@ static void
 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
 		uint64_t id, const char *path, int form)
 {
-	char		*newnames;
+	char		*newnames, *prevsec, *prevarch;
 	const char	*oldnames, *sep1, *name, *sec, *sep2, *arch, *fsec;
 	size_t		 i;
 	int		 c;
 
+	mpage->file = NULL;
 	mpage->names = NULL;
+	prevsec = prevarch = NULL;
 	i = 1;
 	SQL_BIND_INT64(db, s, i, id);
 	while (SQLITE_ROW == (c = sqlite3_step(s))) {
 
-		/* Assemble the list of names. */
+		/* Decide whether we already have some names. */
 
 		if (NULL == mpage->names) {
 			oldnames = "";
@@ -322,15 +326,39 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3
 			oldnames = mpage->names;
 			sep1 = ", ";
 		}
+
+		/* Fetch the next name. */
+
 		sec = sqlite3_column_text(s, 0);
 		arch = sqlite3_column_text(s, 1);
 		name = sqlite3_column_text(s, 2);
-		sep2 = '\0' == *arch ? "" : "/";
-		if (-1 == asprintf(&newnames, "%s%s%s(%s%s%s)",
-		    oldnames, sep1, name, sec, sep2, arch)) {
-			perror(0);
-			exit((int)MANDOCLEVEL_SYSERR);
+
+		/* If the section changed, append the old one. */
+
+		if (NULL != prevsec &&
+		    (strcmp(sec, prevsec) ||
+		     strcmp(arch, prevarch))) {
+			sep2 = '\0' == *prevarch ? "" : "/";
+			mandoc_asprintf(&newnames, "%s(%s%s%s)",
+			    oldnames, prevsec, sep2, prevarch);
+			free(mpage->names);
+			oldnames = mpage->names = newnames;
+			free(prevsec);
+			free(prevarch);
+			prevsec = prevarch = NULL;
 		}
+
+		/* Save the new section, to append it later. */
+
+		if (NULL == prevsec) {
+			prevsec = mandoc_strdup(sec);
+			prevarch = mandoc_strdup(arch);
+		}
+
+		/* Append the new name. */
+
+		mandoc_asprintf(&newnames, "%s%s%s",
+		    oldnames, sep1, name);
 		free(mpage->names);
 		mpage->names = newnames;
 
@@ -346,15 +374,25 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3
 			sep1 = "cat";
 			fsec = "0";
 		}
-		if (-1 == asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s",
-		    path, sep1, sec, sep2, arch, name, fsec)) {
-			perror(0);
-			exit((int)MANDOCLEVEL_SYSERR);
-		}
+		sep2 = '\0' == *arch ? "" : "/";
+		mandoc_asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s",
+		    path, sep1, sec, sep2, arch, name, fsec);
 	}
 	if (SQLITE_DONE != c)
 		fprintf(stderr, "%s\n", sqlite3_errmsg(db));
 	sqlite3_reset(s);
+
+	/* Append one final section to the names. */
+
+	if (NULL != prevsec) {
+		sep2 = '\0' == *prevarch ? "" : "/";
+		mandoc_asprintf(&newnames, "%s(%s%s%s)",
+		    mpage->names, prevsec, sep2, prevarch);
+		free(mpage->names);
+		mpage->names = newnames;
+		free(prevsec);
+		free(prevarch);
+	}
 }
 
 static char *
@@ -378,11 +416,8 @@ buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t id,
 			sep1 = " # ";
 		}
 		data = sqlite3_column_text(s, 1);
-		if (-1 == asprintf(&newoutput, "%s%s%s",
-		    oldoutput, sep1, data)) {
-			perror(0);
-			exit((int)MANDOCLEVEL_SYSERR);
-		}
+		mandoc_asprintf(&newoutput, "%s%s%s",
+		    oldoutput, sep1, data);
 		free(output);
 		output = newoutput;
 	}
@@ -554,10 +589,7 @@ exprspec(struct expr *cur, uint64_t key, const char *v
 	if (NULL == value)
 		return(cur);
 
-	if (-1 == asprintf(&cp, format, value)) {
-		perror(0);
-		exit((int)MANDOCLEVEL_SYSERR);
-	}
+	mandoc_asprintf(&cp, format, value);
 	cur->next = mandoc_calloc(1, sizeof(struct expr));
 	cur = cur->next;
 	cur->and = 1;
@@ -608,6 +640,8 @@ exprterm(const struct mansearch *search, char *buf, in
 		e->bits = search->deftype;
 
 	if ('~' == *v++) {
+		if (NULL != strstr(buf, "arch"))
+			cs = 0;
 		if (0 != (irc = regcomp(&e->regexp, v,
 		    REG_EXTENDED | REG_NOSUB | (cs ? 0 : REG_ICASE)))) {
 			regerror(irc, &e->regexp, errbuf, sizeof(errbuf));