===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.180
retrieving revision 1.182
diff -u -p -r1.180 -r1.182
--- mandoc/main.c	2014/08/17 03:24:47	1.180
+++ mandoc/main.c	2014/08/21 00:32:15	1.182
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.180 2014/08/17 03:24:47 schwarze Exp $ */
+/*	$Id: main.c,v 1.182 2014/08/21 00:32:15 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -41,6 +41,15 @@
 # endif
 #endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
+enum	outmode {
+	OUTMODE_DEF = 0,
+	OUTMODE_FLN,
+	OUTMODE_LST,
+	OUTMODE_ALL,
+	OUTMODE_INT,
+	OUTMODE_ONE
+};
+
 typedef	void		(*out_mdoc)(void *, const struct mdoc *);
 typedef	void		(*out_man)(void *, const struct man *);
 typedef	void		(*out_free)(void *);
@@ -80,6 +89,7 @@ static	void		  usage(enum argmode) __attribute__((nore
 static	void		  version(void) __attribute__((noreturn));
 static	int		  woptions(struct curparse *, char *);
 
+static	const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9};
 static	const char	 *progname;
 
 
@@ -93,9 +103,13 @@ main(int argc, char *argv[])
 	char		*defos;
 #if HAVE_SQLITE3
 	struct manpage	*res;
-	size_t		 i, sz;
+	char		**auxargv;
+	size_t		 isec, i, sz;
+	int		 prio, best_prio;
+	char		 sec;
 #endif
 	enum mandoclevel rc;
+	enum outmode	 outmode;
 	int		 show_usage;
 	int		 options;
 	int		 c;
@@ -132,8 +146,12 @@ main(int argc, char *argv[])
 	defos = NULL;
 
 	show_usage = 0;
-	while (-1 != (c = getopt(argc, argv, "C:fI:kM:m:O:S:s:T:VW:"))) {
+	outmode = OUTMODE_DEF;
+	while (-1 != (c = getopt(argc, argv, "aC:fI:ikM:m:O:S:s:T:VW:w"))) {
 		switch (c) {
+		case 'a':
+			outmode = OUTMODE_ALL;
+			break;
 		case 'C':
 			conf_file = optarg;
 			break;
@@ -155,6 +173,9 @@ main(int argc, char *argv[])
 			}
 			defos = mandoc_strdup(optarg + 3);
 			break;
+		case 'i':
+			outmode = OUTMODE_INT;
+			break;
 		case 'k':
 			search.argmode = ARG_EXPR;
 			break;
@@ -183,6 +204,9 @@ main(int argc, char *argv[])
 			if ( ! woptions(&curp, optarg))
 				return((int)MANDOCLEVEL_BADARG);
 			break;
+		case 'w':
+			outmode = OUTMODE_FLN;
+			break;
 		case 'V':
 			version();
 			/* NOTREACHED */
@@ -195,26 +219,94 @@ main(int argc, char *argv[])
 	if (show_usage)
 		usage(search.argmode);
 
+	if (outmode == OUTMODE_DEF) {
+		switch (search.argmode) {
+		case ARG_FILE:
+			outmode = OUTMODE_ALL;
+			break;
+		case ARG_NAME:
+			outmode = OUTMODE_ONE;
+			break;
+		default:
+			outmode = OUTMODE_LST;
+			break;
+		}
+	}
+
 	argc -= optind;
 	argv += optind;
+#if HAVE_SQLITE3
+	auxargv = NULL;
+#endif
 
+	rc = MANDOCLEVEL_OK;
+
 	/* man(1), whatis(1), apropos(1) */
 
 	if (search.argmode != ARG_FILE) {
 #if HAVE_SQLITE3
 		if (argc == 0)
 			usage(search.argmode);
+
+		/* Access the mandoc database. */
+
 		manpath_parse(&paths, conf_file, defpaths, auxpaths);
 		mansearch_setup(1);
 		if( ! mansearch(&search, &paths, argc, argv, &res, &sz))
 			usage(search.argmode);
 		manpath_free(&paths);
-		for (i = 0; i < sz; i++)
-			printf("%s - %s\n", res[i].names,
-			    res[i].output == NULL ? "" : res[i].output);
-		mansearch_free(res, sz);
-		mansearch_setup(0);
-		return((int)MANDOCLEVEL_OK);
+
+		/*
+		 * For standard man(1) and -a output mode,
+		 * prepare for copying filename pointers
+		 * into the program parameter array.
+		 */
+
+		if (outmode == OUTMODE_ONE) {
+			argc = 1;
+			argv[0] = res[0].file;
+			argv[1] = NULL;
+			best_prio = 10;
+		} else if (outmode == OUTMODE_ALL) {
+			argc = (int)sz;
+			argv = auxargv = mandoc_reallocarray(
+			    NULL, sz + 1, sizeof(char *));
+			argv[argc] = NULL;
+		}
+
+		/* Iterate all matching manuals. */
+
+		for (i = 0; i < sz; i++) {
+			if (outmode == OUTMODE_FLN)
+				puts(res[i].file);
+			else if (outmode == OUTMODE_LST)
+				printf("%s - %s\n", res[i].names,
+				    res[i].output == NULL ? "" :
+				    res[i].output);
+			else if (outmode == OUTMODE_ALL)
+				argv[i] = res[i].file;
+			else {
+				/* Search for the best section. */
+				isec = strcspn(res[i].file, "123456789");
+				sec = res[i].file[isec];
+				if ('\0' == sec)
+					continue;
+				prio = sec_prios[sec - '1'];
+				if (prio >= best_prio)
+					continue;
+				best_prio = prio;
+				argv[0] = res[i].file;
+			}
+		}
+
+		/*
+		 * For man(1), -a and -i output mode, fall through
+		 * to the main mandoc(1) code iterating files
+		 * and running the parsers on each of them.
+		 */
+
+		if (outmode == OUTMODE_FLN || outmode == OUTMODE_LST)
+			goto out;
 #else
 		fputs("mandoc: database support not compiled in\n",
 		    stderr);
@@ -235,8 +327,6 @@ main(int argc, char *argv[])
 	if (OUTT_MAN == curp.outtype)
 		mparse_keep(curp.mp);
 
-	rc = MANDOCLEVEL_OK;
-
 	if (NULL == *argv)
 		parse(&curp, STDIN_FILENO, "<stdin>", &rc);
 
@@ -251,6 +341,16 @@ main(int argc, char *argv[])
 		(*curp.outfree)(curp.outdata);
 	if (curp.mp)
 		mparse_free(curp.mp);
+
+#if HAVE_SQLITE3
+out:
+	if (search.argmode != ARG_FILE) {
+		mansearch_free(res, sz);
+		mansearch_setup(0);
+		free(auxargv);
+	}
+#endif
+
 	free(defos);
 
 	return((int)rc);