===================================================================
RCS file: /cvs/mandoc/Attic/manpage.c,v
retrieving revision 1.1
retrieving revision 1.12
diff -u -p -r1.1 -r1.12
--- mandoc/Attic/manpage.c	2012/06/08 10:44:52	1.1
+++ mandoc/Attic/manpage.c	2015/10/06 18:32:19	1.12
@@ -1,6 +1,7 @@
-/*	$Id: manpage.c,v 1.1 2012/06/08 10:44:52 kristaps Exp $ */
+/*	$Id: manpage.c,v 1.12 2015/10/06 18:32:19 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,19 +15,20 @@
  * 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>
 #include <unistd.h>
 
-#include "manpath.h"
+#include "manconf.h"
 #include "mansearch.h"
 
 static	void	 show(const char *, const char *);
@@ -36,12 +38,12 @@ main(int argc, char *argv[])
 {
 	int		 ch, term;
 	size_t		 i, sz, len;
+	struct mansearch search;
 	struct manpage	*res;
-	char		*conf_file, *defpaths, *auxpaths, *cp,
-			*arch, *sec;
-	char		 buf[MAXPATHLEN];
+	char		*conf_file, *defpaths, *auxpaths, *cp;
+	char		 buf[PATH_MAX];
 	const char	*cmd;
-	struct manpaths	 paths;
+	struct manconf	 conf;
 	char		*progname;
 	extern char	*optarg;
 	extern int	 optind;
@@ -54,8 +56,9 @@ main(int argc, char *argv[])
 	else
 		++progname;
 
-	auxpaths = defpaths = conf_file = arch = sec = NULL;
-	memset(&paths, 0, sizeof(struct manpaths));
+	auxpaths = defpaths = conf_file = NULL;
+	memset(&conf, 0, sizeof(conf));
+	memset(&search, 0, sizeof(struct mansearch));
 
 	while (-1 != (ch = getopt(argc, argv, "C:M:m:S:s:")))
 		switch (ch) {
@@ -69,10 +72,10 @@ main(int argc, char *argv[])
 			auxpaths = optarg;
 			break;
 		case ('S'):
-			arch = optarg;
+			search.arch = optarg;
 			break;
 		case ('s'):
-			sec = optarg;
+			search.sec = optarg;
 			break;
 		default:
 			goto usage;
@@ -84,31 +87,37 @@ main(int argc, char *argv[])
 	if (0 == argc)
 		goto usage;
 
-	manpath_parse(&paths, conf_file, defpaths, auxpaths);
-	ch = mansearch(&paths, arch, sec, argc, argv, &res, &sz);
-	manpath_free(&paths);
+	search.outkey = "Nd";
+	search.argmode = ARG_EXPR;
 
+	manconf_parse(&conf, conf_file, defpaths, auxpaths);
+	ch = mansearch(&search, &conf.manpath, argc, argv, &res, &sz);
+	manconf_free(&conf);
+
 	if (0 == ch)
 		goto usage;
 
 	if (0 == sz) {
 		free(res);
-		return(EXIT_FAILURE);
+		return EXIT_FAILURE;
 	} else if (1 == sz && term) {
 		i = 1;
 		goto show;
 	} else if (NULL == res)
-		return(EXIT_FAILURE);
+		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);
+		return EXIT_SUCCESS;
 	}
 
 	i = 1;
@@ -123,25 +132,29 @@ main(int argc, char *argv[])
 		}
 
 	if (0 == i) {
+		for (i = 0; i < sz; i++)
+			free(res[i].file);
 		free(res);
-		return(EXIT_SUCCESS);
+		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);
+	return EXIT_FAILURE;
 }
 
 static void
@@ -161,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);