===================================================================
RCS file: /cvs/mandoc/mansearch.c,v
retrieving revision 1.9
retrieving revision 1.12
diff -u -p -r1.9 -r1.12
--- mandoc/mansearch.c	2013/12/27 01:16:54	1.9
+++ mandoc/mansearch.c	2013/12/31 03:41:14	1.12
@@ -1,4 +1,4 @@
-/*	$Id: mansearch.c,v 1.9 2013/12/27 01:16:54 schwarze Exp $ */
+/*	$Id: mansearch.c,v 1.12 2013/12/31 03:41:14 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -121,6 +121,9 @@ static	const struct type types[] = {
 	{ 0ULL, NULL }
 };
 
+static	char		*buildnames(sqlite3 *, sqlite3_stmt *, uint64_t);
+static	char		*buildoutput(sqlite3 *, sqlite3_stmt *,
+				 uint64_t, uint64_t);
 static	void		*hash_alloc(size_t, void *);
 static	void		 hash_free(void *, size_t, void *);
 static	void		*hash_halloc(size_t, void *);
@@ -137,17 +140,20 @@ static	char		*sql_statement(const struct expr *,
 
 int
 mansearch(const struct mansearch *search,
-		const struct manpaths *paths, 
-		int argc, char *argv[], 
+		const struct manpaths *paths,
+		int argc, char *argv[],
+		const char *outkey,
 		struct manpage **res, size_t *sz)
 {
-	int		 fd, rc, c;
+	int		 fd, rc, c, ibit;
 	int64_t		 id;
+	uint64_t	 outbit;
 	char		 buf[PATH_MAX];
 	char		*sql;
+	struct manpage	*mpage;
 	struct expr	*e, *ep;
 	sqlite3		*db;
-	sqlite3_stmt	*s;
+	sqlite3_stmt	*s, *s2;
 	struct match	*mp;
 	struct ohash_info info;
 	struct ohash	 htab;
@@ -173,6 +179,16 @@ mansearch(const struct mansearch *search,
 	if (NULL == (e = exprcomp(search, argc, argv)))
 		goto out;
 
+	outbit = 0;
+	if (NULL != outkey) {
+		for (ibit = 0; types[ibit].bits; ibit++) {
+			if (0 == strcasecmp(types[ibit].name, outkey)) {
+				outbit = types[ibit].bits;
+				break;
+			}
+		}
+	}
+
 	/*
 	 * Save a descriptor to the current working directory.
 	 * Since pathnames in the "paths" variable might be relative,
@@ -282,8 +298,19 @@ mansearch(const struct mansearch *search,
 			fprintf(stderr, "%s\n", sqlite3_errmsg(db));
 
 		sqlite3_finalize(s);
-		sqlite3_close(db);
 
+		c = sqlite3_prepare_v2(db, 
+		    "SELECT * FROM mlinks WHERE pageid=?",
+		    -1, &s, NULL);
+		if (SQLITE_OK != c)
+			fprintf(stderr, "%s\n", sqlite3_errmsg(db));
+
+		c = sqlite3_prepare_v2(db,
+		    "SELECT * FROM keys WHERE pageid=? AND bits & ?",
+		    -1, &s2, NULL);
+		if (SQLITE_OK != c)
+			fprintf(stderr, "%s\n", sqlite3_errmsg(db));
+
 		for (mp = ohash_first(&htab, &idx);
 				NULL != mp;
 				mp = ohash_next(&htab, &idx)) {
@@ -292,16 +319,26 @@ mansearch(const struct mansearch *search,
 				*res = mandoc_realloc
 					(*res, maxres * sizeof(struct manpage));
 			}
-			strlcpy((*res)[cur].file, 
-				paths->paths[i], PATH_MAX);
-			strlcat((*res)[cur].file, "/", PATH_MAX);
-			strlcat((*res)[cur].file, mp->file, PATH_MAX);
-			(*res)[cur].desc = mp->desc;
-			(*res)[cur].form = mp->form;
+			mpage = *res + cur;
+			if (-1 == asprintf(&mpage->file, "%s/%s",
+			    paths->paths[i], mp->file)) {
+				perror(0);
+				exit((int)MANDOCLEVEL_SYSERR);
+			}
+			mpage->desc = mp->desc;
+			mpage->form = mp->form;
+			mpage->names = buildnames(db, s, mp->id);
+			mpage->output = outbit ?
+			    buildoutput(db, s2, mp->id, outbit) : NULL;
+
 			free(mp->file);
 			free(mp);
 			cur++;
 		}
+
+		sqlite3_finalize(s);
+		sqlite3_finalize(s2);
+		sqlite3_close(db);
 		ohash_delete(&htab);
 	}
 	rc = 1;
@@ -312,6 +349,78 @@ out:
 	free(sql);
 	*sz = cur;
 	return(rc);
+}
+
+static char *
+buildnames(sqlite3 *db, sqlite3_stmt *s, uint64_t id)
+{
+	char		*names, *newnames;
+	const char	*oldnames, *sep1, *name, *sec, *sep2, *arch;
+	size_t		 i;
+	int		 c;
+
+	names = NULL;
+	i = 1;
+	SQL_BIND_INT64(db, s, i, id);
+	while (SQLITE_ROW == (c = sqlite3_step(s))) {
+		if (NULL == names) {
+			oldnames = "";
+			sep1 = "";
+		} else {
+			oldnames = names;
+			sep1 = ", ";
+		}
+		sec = sqlite3_column_text(s, 1);
+		arch = sqlite3_column_text(s, 2);
+		name = sqlite3_column_text(s, 3);
+		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);
+		}
+		free(names);
+		names = newnames;
+	}
+	if (SQLITE_DONE != c)
+		fprintf(stderr, "%s\n", sqlite3_errmsg(db));
+	sqlite3_reset(s);
+	return(names);
+}
+
+static char *
+buildoutput(sqlite3 *db, sqlite3_stmt *s, uint64_t id, uint64_t outbit)
+{
+	char		*output, *newoutput;
+	const char	*oldoutput, *sep1, *data;
+	size_t		 i;
+	int		 c;
+
+	output = NULL;
+	i = 1;
+	SQL_BIND_INT64(db, s, i, id);
+	SQL_BIND_INT64(db, s, i, outbit);
+	while (SQLITE_ROW == (c = sqlite3_step(s))) {
+		if (NULL == output) {
+			oldoutput = "";
+			sep1 = "";
+		} else {
+			oldoutput = output;
+			sep1 = " # ";
+		}
+		data = sqlite3_column_text(s, 1);
+		if (-1 == asprintf(&newoutput, "%s%s%s",
+		    oldoutput, sep1, data)) {
+			perror(0);
+			exit((int)MANDOCLEVEL_SYSERR);
+		}
+		free(output);
+		output = newoutput;
+	}
+	if (SQLITE_DONE != c)
+		fprintf(stderr, "%s\n", sqlite3_errmsg(db));
+	sqlite3_reset(s);
+	return(output);
 }
 
 /*