===================================================================
RCS file: /cvs/mandoc/mansearch.c,v
retrieving revision 1.38
retrieving revision 1.42
diff -u -p -r1.38 -r1.42
--- mandoc/mansearch.c	2014/07/12 14:00:25	1.38
+++ mandoc/mansearch.c	2014/08/09 14:24:53	1.42
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.c,v 1.38 2014/07/12 14:00:25 schwarze Exp $ */
+/*	$Id: mansearch.c,v 1.42 2014/08/09 14:24:53 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -38,6 +38,9 @@
 #include "compat_ohash.h"
 #endif
 #include <sqlite3.h>
+#ifndef SQLITE_DETERMINISTIC
+#define SQLITE_DETERMINISTIC 0
+#endif
 
 #include "mandoc.h"
 #include "mandoc_aux.h"
@@ -94,6 +97,7 @@ static	void		 exprfree(struct expr *);
 static	struct expr	*exprspec(struct expr *, uint64_t,
 				 const char *, const char *);
 static	struct expr	*exprterm(const struct mansearch *, char *, int);
+static	int		 manpage_compare(const void *, const void *);
 static	void		 sql_append(char **sql, size_t *sz,
 				const char *newstr, int count);
 static	void		 sql_match(sqlite3_context *context,
@@ -119,7 +123,8 @@ mansearch_setup(int start)
 		}
 
 		pagecache = mmap(NULL, PC_PAGESIZE * PC_NUMPAGES,
-		    PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
+		    PROT_READ | PROT_WRITE,
+		    MAP_SHARED | MAP_ANON, -1, 0);
 
 		if (MAP_FAILED == pagecache) {
 			perror("mmap");
@@ -298,7 +303,7 @@ mansearch(const struct mansearch *search,
 			mp->pageid = pageid;
 			mp->form = sqlite3_column_int(s, 1);
 			if (TYPE_Nd == outbit)
-				mp->desc = mandoc_strdup(
+				mp->desc = mandoc_strdup((const char *)
 				    sqlite3_column_text(s, 0));
 			ohash_insert(&htab, idx, mp);
 		}
@@ -331,6 +336,7 @@ mansearch(const struct mansearch *search,
 				    maxres, sizeof(struct manpage));
 			}
 			mpage = *res + cur;
+			mpage->sec = 10;
 			mpage->form = mp->form;
 			buildnames(mpage, db, s, mp->pageid,
 			    paths->paths[i], mp->form);
@@ -347,6 +353,7 @@ mansearch(const struct mansearch *search,
 		sqlite3_close(db);
 		ohash_delete(&htab);
 	}
+	qsort(*res, cur, sizeof(struct manpage), manpage_compare);
 	rc = 1;
 out:
 	if (-1 != fd) {
@@ -360,6 +367,18 @@ out:
 	return(rc);
 }
 
+static int
+manpage_compare(const void *vp1, const void *vp2)
+{
+	const struct manpage	*mp1, *mp2;
+	int			 diff;
+
+	mp1 = vp1;
+	mp2 = vp2;
+	diff = mp1->sec - mp2->sec;
+	return(diff ? diff : strcasecmp(mp1->names, mp2->names));
+}
+
 static void
 buildnames(struct manpage *mpage, sqlite3 *db, sqlite3_stmt *s,
 		uint64_t pageid, const char *path, int form)
@@ -388,10 +407,15 @@ buildnames(struct manpage *mpage, sqlite3 *db, sqlite3
 
 		/* Fetch the next name. */
 
-		sec = sqlite3_column_text(s, 0);
-		arch = sqlite3_column_text(s, 1);
-		name = sqlite3_column_text(s, 2);
+		sec = (const char *)sqlite3_column_text(s, 0);
+		arch = (const char *)sqlite3_column_text(s, 1);
+		name = (const char *)sqlite3_column_text(s, 2);
 
+		/* Remember the first section found. */
+
+		if (9 < mpage->sec && '1' <= *sec && '9' >= *sec)
+			mpage->sec = (*sec - '1') + 1;
+
 		/* If the section changed, append the old one. */
 
 		if (NULL != prevsec &&
@@ -474,7 +498,7 @@ buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t pag
 			oldoutput = output;
 			sep1 = " # ";
 		}
-		data = sqlite3_column_text(s, 1);
+		data = (const char *)sqlite3_column_text(s, 1);
 		mandoc_asprintf(&newoutput, "%s%s%s",
 		    oldoutput, sep1, data);
 		free(output);