===================================================================
RCS file: /cvs/mandoc/Attic/manpage.c,v
retrieving revision 1.3
retrieving revision 1.10
diff -u -p -r1.3 -r1.10
--- mandoc/Attic/manpage.c	2012/06/09 17:49:13	1.3
+++ mandoc/Attic/manpage.c	2015/02/10 08:05:30	1.10
@@ -1,6 +1,7 @@
-/*	$Id: manpage.c,v 1.3 2012/06/09 17:49:13 kristaps Exp $ */
+/*	$Id: manpage.c,v 1.10 2015/02/10 08:05:30 schwarze Exp $ */
 /*
  * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2013 Ingo Schwarze <schwarze@openbsd.org>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -14,13 +15,13 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
-#include <sys/param.h>
 
+#include <sys/types.h>
+
 #include <assert.h>
 #include <getopt.h>
+#include <limits.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -40,7 +41,7 @@ main(int argc, char *argv[])
 	struct mansearch search;
 	struct manpage	*res;
 	char		*conf_file, *defpaths, *auxpaths, *cp;
-	char		 buf[MAXPATHLEN];
+	char		 buf[PATH_MAX];
 	const char	*cmd;
 	struct manpaths	 paths;
 	char		*progname;
@@ -86,7 +87,8 @@ main(int argc, char *argv[])
 	if (0 == argc)
 		goto usage;
 
-	search.deftype = TYPE_Nm | TYPE_Nd;
+	search.outkey = "Nd";
+	search.argmode = ARG_EXPR;
 
 	manpath_parse(&paths, conf_file, defpaths, auxpaths);
 	ch = mansearch(&search, &paths, argc, argv, &res, &sz);
@@ -105,12 +107,15 @@ main(int argc, char *argv[])
 		return(EXIT_FAILURE);
 
 	for (i = 0; i < sz; i++) {
-		printf("%6zu  %s: %s\n", 
-			i + 1, res[i].file, res[i].desc);
-		free(res[i].desc);
+		printf("%6zu  %s: %s\n",
+			i + 1, res[i].names, res[i].output);
+		free(res[i].names);
+		free(res[i].output);
 	}
 
 	if (0 == term) {
+		for (i = 0; i < sz; i++)
+			free(res[i].file);
 		free(res);
 		return(EXIT_SUCCESS);
 	}
@@ -127,23 +132,27 @@ main(int argc, char *argv[])
 		}
 
 	if (0 == i) {
+		for (i = 0; i < sz; i++)
+			free(res[i].file);
 		free(res);
 		return(EXIT_SUCCESS);
 	}
 show:
 	cmd = res[i - 1].form ? "mandoc" : "cat";
-	strlcpy(buf, res[i - 1].file, MAXPATHLEN);
+	strlcpy(buf, res[i - 1].file, PATH_MAX);
+	for (i = 0; i < sz; i++)
+		free(res[i].file);
 	free(res);
 
 	show(cmd, buf);
 	/* NOTREACHED */
 usage:
 	fprintf(stderr, "usage: %s [-C conf] "
-			 	  "[-M paths] "
+				  "[-M paths] "
 				  "[-m paths] "
 				  "[-S arch] "
 				  "[-s section] "
-			          "expr ...\n", 
+			          "expr ...\n",
 				  progname);
 	return(EXIT_FAILURE);
 }
@@ -165,9 +174,9 @@ show(const char *cmd, const char *file)
 	} else if (pid > 0) {
 		dup2(fds[0], STDIN_FILENO);
 		close(fds[1]);
-		cmd = NULL != getenv("MANPAGER") ? 
+		cmd = NULL != getenv("MANPAGER") ?
 			getenv("MANPAGER") :
-			(NULL != getenv("PAGER") ? 
+			(NULL != getenv("PAGER") ?
 			 getenv("PAGER") : "more");
 		execlp(cmd, cmd, (char *)NULL);
 		perror(cmd);