===================================================================
RCS file: /cvs/mandoc/mandocdb.c,v
retrieving revision 1.70
retrieving revision 1.74
diff -u -p -r1.70 -r1.74
--- mandoc/mandocdb.c	2013/07/02 12:58:54	1.70
+++ mandoc/mandocdb.c	2013/10/27 16:09:44	1.74
@@ -1,4 +1,4 @@
-/*	$Id: mandocdb.c,v 1.70 2013/07/02 12:58:54 schwarze Exp $ */
+/*	$Id: mandocdb.c,v 1.74 2013/10/27 16:09:44 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2011, 2012, 2013 Ingo Schwarze <schwarze@openbsd.org>
@@ -140,8 +140,7 @@ static	int	 inocheck(const struct stat *);
 static	void	 ofadd(int, const char *, const char *, const char *,
 			const char *, const char *, const struct stat *);
 static	void	 offree(void);
-static	void	 ofmerge(struct mchars *, struct mparse *,
-			struct ohash_info*, int);
+static	void	 ofmerge(struct mchars *, struct mparse *, int);
 static	void	 parse_catpage(struct of *);
 static	void	 parse_man(struct of *, const struct man_node *);
 static	void	 parse_mdoc(struct of *, const struct mdoc_node *);
@@ -316,21 +315,17 @@ main(int argc, char *argv[])
 	struct mchars	 *mc;
 	struct manpaths	  dirs;
 	struct mparse	 *mp;
-	struct ohash_info ino_info, filename_info, str_info;
+	struct ohash_info ino_info, filename_info;
 
 	memset(stmts, 0, STMT__MAX * sizeof(sqlite3_stmt *));
 	memset(&dirs, 0, sizeof(struct manpaths));
 
-	ino_info.halloc = filename_info.halloc = 
-		str_info.halloc = hash_halloc;
-	ino_info.hfree = filename_info.hfree = 
-		str_info.hfree = hash_free;
-	ino_info.alloc = filename_info.alloc = 
-		str_info.alloc = hash_alloc;
+	ino_info.alloc  = filename_info.alloc  = hash_alloc;
+	ino_info.halloc = filename_info.halloc = hash_halloc;
+	ino_info.hfree  = filename_info.hfree  = hash_free;
 
 	ino_info.key_offset = offsetof(struct of, id);
 	filename_info.key_offset = offsetof(struct of, file);
-	str_info.key_offset = offsetof(struct str, key);
 
 	progname = strrchr(argv[0], '/');
 	if (progname == NULL)
@@ -427,7 +422,7 @@ main(int argc, char *argv[])
 		if (OP_TEST != op)
 			dbprune();
 		if (OP_DELETE != op)
-			ofmerge(mc, mp, &str_info, 0);
+			ofmerge(mc, mp, 0);
 		dbclose(1);
 	} else {
 		/*
@@ -471,7 +466,7 @@ main(int argc, char *argv[])
 			if (0 == dbopen(0))
 				goto out;
 
-			ofmerge(mc, mp, &str_info, warnings && !use_all);
+			ofmerge(mc, mp, warnings && !use_all);
 			dbclose(0);
 
 			if (j + 1 < dirs.sz) {
@@ -690,7 +685,7 @@ filescan(const char *file)
 		exitcode = (int)MANDOCLEVEL_BADARG;
 		say(file, NULL);
 		return;
-	} else if (strstr(buf, basedir) != buf) {
+	} else if (OP_TEST != op && strstr(buf, basedir) != buf) {
 		exitcode = (int)MANDOCLEVEL_BADARG;
 		say("", "%s: outside base directory", buf);
 		return;
@@ -841,13 +836,13 @@ ofadd(int dform, const char *file, const char *name, c
 	if (NULL == arch)
 		arch = "";
 
-	sform = FORM_NONE;
-	if (NULL != sec && *sec <= '9' && *sec >= '1')
-		sform = FORM_SRC;
-	else if (NULL != sec && *sec == '0') {
+	if ('0' == *sec) {
 		sec = dsec;
 		sform = FORM_CAT;
-	}
+	} else if ('1' <= *sec && '9' >= *sec)
+		sform = FORM_SRC;
+	else
+		sform = FORM_NONE;
 
 	of = mandoc_calloc(1, sizeof(struct of));
 	strlcpy(of->file, file, PATH_MAX);
@@ -892,11 +887,10 @@ offree(void)
  * and filename to determine whether the file is parsable or not.
  */
 static void
-ofmerge(struct mchars *mc, struct mparse *mp,
-		struct ohash_info *infop, int check_reachable)
+ofmerge(struct mchars *mc, struct mparse *mp, int check_reachable)
 {
 	struct ohash		 title_table;
-	struct ohash_info	 title_info;
+	struct ohash_info	 title_info, str_info;
 	char			 buf[PATH_MAX];
 	struct of		*of;
 	struct mdoc		*mdoc;
@@ -910,6 +904,11 @@ ofmerge(struct mchars *mc, struct mparse *mp,
 	unsigned int		 slot;
 	enum mandoclevel	 lvl;
 
+	str_info.alloc = hash_alloc;
+	str_info.halloc = hash_halloc;
+	str_info.hfree = hash_free;
+	str_info.key_offset = offsetof(struct str, key);
+
 	if (check_reachable) {
 		title_info.alloc = hash_alloc;
 		title_info.halloc = hash_halloc;
@@ -947,7 +946,7 @@ ofmerge(struct mchars *mc, struct mparse *mp,
 			}
 		}
 
-		ohash_init(&strings, 6, infop);
+		ohash_init(&strings, 6, &str_info);
 		mparse_reset(mp);
 		mdoc = NULL;
 		man = NULL;
@@ -1793,7 +1792,7 @@ dbindex(struct mchars *mc, int form, const struct of *
 		return;
 
 	desc = "";
-	if (NULL != of->desc) {
+	if (NULL != of->desc && '\0' != *of->desc) {
 		key = ohash_find(&strings,
 			ohash_qlookup(&strings, of->desc));
 		assert(NULL != key);