===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.36
retrieving revision 1.39
diff -u -p -r1.36 -r1.39
--- mandoc/cgi.c	2011/12/16 18:37:12	1.36
+++ mandoc/cgi.c	2011/12/25 17:49:52	1.39
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.36 2011/12/16 18:37:12 kristaps Exp $ */
+/*	$Id: cgi.c,v 1.39 2011/12/25 17:49:52 kristaps Exp $ */
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -41,6 +41,7 @@
 #include "man.h"
 #include "main.h"
 #include "manpath.h"
+#include "mandocdb.h"
 
 #ifdef __linux__
 # include <db_185.h>
@@ -134,7 +135,7 @@ atou(const char *buf, unsigned *v)
 		return(0);
 	if ((errno == ERANGE && (lval == LONG_MAX || 
 					lval == LONG_MIN)) ||
-			(lval > UINT_MAX || lval < 0))
+			(lval > INT_MAX || lval < 0))
 		return(0);
 
 	*v = (unsigned int)lval;
@@ -510,7 +511,9 @@ resp_search(struct res *r, size_t sz, void *arg)
 	const struct req *req;
 
 	req = (const struct req *)arg;
-	assert(req->q.manroot >= 0);
+
+	if (sz > 0)
+		assert(req->q.manroot >= 0);
 	
 	if (1 == sz) {
 		/*
@@ -841,7 +844,8 @@ pg_show(const struct req *req, char *path)
 
 	sz = strlcpy(file, ps.paths[vol], MAXPATHLEN);
 	assert(sz < MAXPATHLEN);
-	strlcat(file, "/mandoc.index", MAXPATHLEN);
+	strlcat(file, "/", MAXPATHLEN);
+	strlcat(file, MANDOC_IDX, MAXPATHLEN);
 
 	/* Open the index recno(3) database. */