===================================================================
RCS file: /cvs/mandoc/Attic/manpage.c,v
retrieving revision 1.2
retrieving revision 1.8
diff -u -p -r1.2 -r1.8
--- mandoc/Attic/manpage.c	2012/06/09 14:11:16	1.2
+++ mandoc/Attic/manpage.c	2014/08/10 23:54:41	1.8
@@ -1,6 +1,7 @@
-/*	$Id: manpage.c,v 1.2 2012/06/09 14:11:16 kristaps Exp $ */
+/*	$Id: manpage.c,v 1.8 2014/08/10 23:54:41 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,14 @@
  * 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>
 #include <string.h>
@@ -39,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;
@@ -88,7 +90,7 @@ main(int argc, char *argv[])
 	search.deftype = TYPE_Nm | TYPE_Nd;
 
 	manpath_parse(&paths, conf_file, defpaths, auxpaths);
-	ch = mansearch(&search, &paths, argc, argv, &res, &sz);
+	ch = mansearch(&search, &paths, argc, argv, "Nd", &res, &sz);
 	manpath_free(&paths);
 
 	if (0 == ch)
@@ -105,11 +107,14 @@ main(int argc, char *argv[])
 
 	for (i = 0; i < sz; i++) {
 		printf("%6zu  %s: %s\n", 
-			i + 1, res[i].file, res[i].desc);
-		free(res[i].desc);
+			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);
 	}
@@ -126,12 +131,16 @@ 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);