===================================================================
RCS file: /cvs/mandoc/Attic/apropos.c,v
retrieving revision 1.15
retrieving revision 1.18
diff -u -p -r1.15 -r1.18
--- mandoc/Attic/apropos.c	2011/11/20 15:43:14	1.15
+++ mandoc/Attic/apropos.c	2011/11/23 09:50:40	1.18
@@ -1,4 +1,4 @@
-/*	$Id: apropos.c,v 1.15 2011/11/20 15:43:14 kristaps Exp $ */
+/*	$Id: apropos.c,v 1.18 2011/11/23 09:50:40 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org>
@@ -20,27 +20,18 @@
 #endif
 
 #include <assert.h>
+#include <ctype.h>
 #include <getopt.h>
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include "apropos_db.h"
 #include "mandoc.h"
+#include "manpath.h"
 
-/*
- * List of paths to be searched for manual databases.
- */
-struct	manpaths {
-	int	  sz;
-	char	**paths;
-};
-
 static	int	 cmp(const void *, const void *);
 static	void	 list(struct res *, size_t, void *);
-static	int	 manpath_add(struct manpaths *, const char *);
-static	int	 manpath_parse(struct manpaths *, char *);
 static	void	 usage(void);
 
 static	char	*progname;
@@ -48,11 +39,12 @@ static	char	*progname;
 int
 main(int argc, char *argv[])
 {
-	int		 i, ch, rc;
+	int		 ch, rc;
 	struct manpaths	 paths;
 	size_t		 terms;
 	struct opts	 opts;
 	struct expr	*e;
+	char		*defpaths, *auxpaths;
 	extern int	 optind;
 	extern char	*optarg;
 
@@ -65,14 +57,17 @@ main(int argc, char *argv[])
 	memset(&paths, 0, sizeof(struct manpaths));
 	memset(&opts, 0, sizeof(struct opts));
 
+	auxpaths = defpaths = NULL;
 	e = NULL;
 	rc = 0;
 
-	while (-1 != (ch = getopt(argc, argv, "m:S:s:"))) 
+	while (-1 != (ch = getopt(argc, argv, "M:m:S:s:"))) 
 		switch (ch) {
+		case ('M'):
+			defpaths = optarg;
+			break;
 		case ('m'):
-			if ( ! manpath_parse(&paths, optarg))
-				goto out;
+			auxpaths = optarg;
 			break;
 		case ('S'):
 			opts.arch = optarg;
@@ -93,12 +88,10 @@ main(int argc, char *argv[])
 		goto out;
 	}
 
-	if (0 == paths.sz && ! manpath_add(&paths, "."))
-		goto out;
+	manpath_parse(&paths, defpaths, auxpaths);
 
 	if (NULL == (e = exprcomp(argc, argv, &terms))) {
-		/* FIXME: be more specific about this. */
-		fprintf(stderr, "Bad expression\n");
+		fprintf(stderr, "%s: Bad expression\n", progname);
 		goto out;
 	}
 
@@ -106,13 +99,12 @@ main(int argc, char *argv[])
 		(paths.sz, paths.paths, 
 		 &opts, e, terms, NULL, list);
 
-	/* FIXME: report an error based on ch. */
+	if (0 == rc) 
+		fprintf(stderr, "%s: Error reading "
+				"manual database\n", progname);
 
 out:
-	for (i = 0; i < paths.sz; i++)
-		free(paths.paths[i]);
-
-	free(paths.paths);
+	manpath_free(&paths);
 	exprfree(e);
 
 	return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
@@ -147,47 +139,9 @@ usage(void)
 {
 
 	fprintf(stderr, "usage: %s "
+			"[-M dirs] "
 			"[-m dirs] "
 			"[-S arch] "
 			"[-s section] "
 			"expression...\n", progname);
-}
-
-/*
- * Parse a FULL pathname from a colon-separated list of arrays.
- */
-static int
-manpath_parse(struct manpaths *dirs, char *path) 
-{
-	char	*dir;
-
-	for (dir = strtok(path, ":"); dir; dir = strtok(NULL, ":"))
-		if ( ! manpath_add(dirs, dir))
-			return(0);
-
-	return(1);
-}
-
-/*
- * Add a directory to the array.
- * Grow the array one-by-one for simplicity's sake.
- * Return 0 if the directory is not a real path.
- */
-static int
-manpath_add(struct manpaths *dirs, const char *dir) 
-{
-	char		 buf[PATH_MAX];
-	char		*cp;
-
-	if (NULL == (cp = realpath(dir, buf))) {
-		fprintf(stderr, "%s: Invalid path\n", dir);
-		return(0);
-	}
-
-	dirs->paths = mandoc_realloc
-		(dirs->paths, 
-		 ((size_t)dirs->sz + 1) * sizeof(char *));
-
-	dirs->paths[dirs->sz++] = mandoc_strdup(cp);
-	return(1);
 }