===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.36
retrieving revision 1.47
diff -u -p -r1.36 -r1.47
--- mandoc/cgi.c	2011/12/16 18:37:12	1.36
+++ mandoc/cgi.c	2014/01/05 20:41:04	1.47
@@ -1,6 +1,6 @@
-/*	$Id: cgi.c,v 1.36 2011/12/16 18:37:12 kristaps Exp $ */
+/*	$Id: cgi.c,v 1.47 2014/01/05 20:41:04 schwarze Exp $ */
 /*
- * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -18,7 +18,6 @@
 #include "config.h"
 #endif
 
-#include <sys/param.h>
 #include <sys/wait.h>
 
 #include <assert.h>
@@ -35,14 +34,22 @@
 #include <string.h>
 #include <unistd.h>
 
+#if defined(__sun)
+/* for stat() */
+#include <fcntl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#endif
+
 #include "apropos_db.h"
 #include "mandoc.h"
 #include "mdoc.h"
 #include "man.h"
 #include "main.h"
 #include "manpath.h"
+#include "mandocdb.h"
 
-#ifdef __linux__
+#if defined(__linux__) || defined(__sun)
 # include <db_185.h>
 #else
 # include <db.h>
@@ -68,7 +75,6 @@ struct	query {
 	const char	*sec; /* manual section */
 	const char	*expr; /* unparsed expression string */
 	int		 manroot; /* manroot index (or -1)*/
-	int		 whatis; /* whether whatis mode */
 	int		 legacy; /* whether legacy mode */
 };
 
@@ -134,7 +140,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;
@@ -229,7 +235,6 @@ http_parse(struct req *req, char *p)
 
 	memset(&req->q, 0, sizeof(struct query));
 
-	req->q.whatis = 1;
 	legacy = -1;
 	manroot = NULL;
 
@@ -267,19 +272,11 @@ http_parse(struct req *req, char *p)
 			manroot = val;
 		else if (0 == strcmp(key, "apropos"))
 			legacy = 0 == strcmp(val, "0");
-		else if (0 == strcmp(key, "op"))
-			req->q.whatis = 0 == strcasecmp(val, "whatis");
 	}
 
 	/* Test for old man.cgi compatibility mode. */
 
-	if (legacy == 0) {
-		req->q.whatis = 0;
-		req->q.legacy = 1;
-	} else if (legacy > 0) {
-		req->q.legacy = 1;
-		req->q.whatis = 1;
-	}
+	req->q.legacy = legacy > 0;
 
 	/* 
 	 * Section "0" means no section when in legacy mode.
@@ -407,10 +404,8 @@ resp_searchform(const struct req *req)
 	       "<FORM ACTION=\"%s/search.html\" METHOD=\"get\">\n"
 	       "<FIELDSET>\n"
 	       "<LEGEND>Search Parameters</LEGEND>\n"
-	       "<INPUT TYPE=\"submit\" NAME=\"op\""
-	       " VALUE=\"Whatis\"> or \n"
-	       "<INPUT TYPE=\"submit\" NAME=\"op\""
-	       " VALUE=\"apropos\"> for manuals satisfying \n"
+	       "<INPUT TYPE=\"submit\" "
+	       " VALUE=\"Search\"> for manuals satisfying \n"
 	       "<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"",
 	       progname);
 	html_print(req->q.expr ? req->q.expr : "");
@@ -506,13 +501,22 @@ resp_baddb(void)
 static void
 resp_search(struct res *r, size_t sz, void *arg)
 {
-	int		  i;
+	size_t		 i, matched;
 	const struct req *req;
 
 	req = (const struct req *)arg;
-	assert(req->q.manroot >= 0);
+
+	if (sz > 0)
+		assert(req->q.manroot >= 0);
+
+	for (matched = i = 0; i < sz; i++)
+		if (r[i].matched)
+			matched++;
 	
-	if (1 == sz) {
+	if (1 == matched) {
+		for (i = 0; i < sz; i++)
+			if (r[i].matched)
+				break;
 		/*
 		 * If we have just one result, then jump there now
 		 * without any delay.
@@ -520,40 +524,34 @@ resp_search(struct res *r, size_t sz, void *arg)
 		puts("Status: 303 See Other");
 		printf("Location: http://%s%s/show/%d/%u/%u.html?",
 				host, progname, req->q.manroot,
-				r[0].volume, r[0].rec);
+				r[i].volume, r[i].rec);
 		http_printquery(req);
 		puts("\n"
 		     "Content-Type: text/html; charset=utf-8\n");
 		return;
 	}
 
-	qsort(r, sz, sizeof(struct res), cmp);
-
 	resp_begin_html(200, NULL);
 	resp_searchform(req);
 
 	puts("<DIV CLASS=\"results\">");
 
-	if (0 == sz) {
-		printf("<P>\n"
-		       "No %s results found.\n",
-		       req->q.whatis ? "whatis" : "apropos");
-		if (req->q.whatis) {
-			printf("(Try "
-			       "<A HREF=\"%s/search.html?op=apropos",
-			       progname);
-			html_printquery(req);
-			puts("\">apropos</A>?)");
-		}
-		puts("</P>");
-		puts("</DIV>");
+	if (0 == matched) {
+		puts("<P>\n"
+		     "No results found.\n"
+		     "</P>\n"
+		     "</DIV>");
 		resp_end_html();
 		return;
 	}
 
+	qsort(r, sz, sizeof(struct res), cmp);
+
 	puts("<TABLE>");
 
-	for (i = 0; i < (int)sz; i++) {
+	for (i = 0; i < sz; i++) {
+		if ( ! r[i].matched)
+			continue;
 		printf("<TR>\n"
 		       "<TD CLASS=\"title\">\n"
 		       "<A HREF=\"%s/show/%d/%u/%u.html?", 
@@ -734,14 +732,14 @@ format(const struct req *req, const char *file)
 	struct man	*man;
 	void		*vp;
 	enum mandoclevel rc;
-	char		 opts[MAXPATHLEN + 128];
+	char		 opts[PATH_MAX + 128];
 
 	if (-1 == (fd = open(file, O_RDONLY, 0))) {
 		resp_baddb();
 		return;
 	}
 
-	mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL);
+	mp = mparse_alloc(MPARSE_AUTO, MANDOCLEVEL_FATAL, NULL, NULL, 0);
 	rc = mparse_readfd(mp, fd, file);
 	close(fd);
 
@@ -751,7 +749,7 @@ format(const struct req *req, const char *file)
 	}
 
 	snprintf(opts, sizeof(opts), "fragment,"
-			"man=%s/search.html?sec=%%S&expr=%%N,"
+			"man=%s/search.html?sec=%%S&expr=Nm~^%%N$,"
 			/*"includes=/cgi-bin/man.cgi/usr/include/%%I"*/,
 			progname);
 
@@ -785,7 +783,7 @@ pg_show(const struct req *req, char *path)
 	struct manpaths	 ps;
 	size_t		 sz;
 	char		*sub;
-	char		 file[MAXPATHLEN];
+	char		 file[PATH_MAX];
 	const char	*cp;
 	int		 rc, catm;
 	unsigned int	 vol, rec, mr;
@@ -839,9 +837,10 @@ pg_show(const struct req *req, char *path)
 		goto out;
 	}
 
-	sz = strlcpy(file, ps.paths[vol], MAXPATHLEN);
-	assert(sz < MAXPATHLEN);
-	strlcat(file, "/mandoc.index", MAXPATHLEN);
+	sz = strlcpy(file, ps.paths[vol], PATH_MAX);
+	assert(sz < PATH_MAX);
+	strlcat(file, "/", PATH_MAX);
+	strlcat(file, MANDOC_IDX, PATH_MAX);
 
 	/* Open the index recno(3) database. */
 
@@ -870,8 +869,8 @@ pg_show(const struct req *req, char *path)
 		resp_baddb();
 	else {
  		file[(int)sz] = '\0';
- 		strlcat(file, "/", MAXPATHLEN);
- 		strlcat(file, cp, MAXPATHLEN);
+ 		strlcat(file, "/", PATH_MAX);
+ 		strlcat(file, cp, PATH_MAX);
 		if (catm) 
 			catman(req, file);
 		else
@@ -886,10 +885,11 @@ out:
 static void
 pg_search(const struct req *req, char *path)
 {
-	size_t		  tt;
+	size_t		  tt, ressz;
 	struct manpaths	  ps;
 	int		  i, sz, rc;
 	const char	 *ep, *start;
+	struct res	*res;
 	char		**cp;
 	struct opts	  opt;
 	struct expr	 *expr;
@@ -907,6 +907,8 @@ pg_search(const struct req *req, char *path)
 	rc 	 = -1;
 	sz 	 = 0;
 	cp	 = NULL;
+	ressz	 = 0;
+	res	 = NULL;
 
 	/*
 	 * Begin by chdir()ing into the root of the manpath.
@@ -949,25 +951,26 @@ pg_search(const struct req *req, char *path)
 	 * The resp_search() function is called with the results.
 	 */
 
-	expr = req->q.whatis ? 
+	expr = req->q.legacy ? 
 		termcomp(sz, cp, &tt) : exprcomp(sz, cp, &tt);
 
 	if (NULL != expr)
 		rc = apropos_search
-			(ps.sz, ps.paths, &opt,
-			 expr, tt, (void *)req, resp_search);
+			(ps.sz, ps.paths, &opt, expr, tt, 
+			 (void *)req, &ressz, &res, resp_search);
 
 	/* ...unless errors occured. */
 
 	if (0 == rc)
 		resp_baddb();
 	else if (-1 == rc)
-		resp_search(NULL, 0, (void *)req);
+		resp_search(NULL, 0, NULL);
 
 	for (i = 0; i < sz; i++)
 		free(cp[i]);
 
 	free(cp);
+	resfree(res, ressz);
 	exprfree(expr);
 	manpath_free(&ps);
 }
@@ -976,7 +979,7 @@ int
 main(void)
 {
 	int		 i;
-	char		 buf[MAXPATHLEN];
+	char		 buf[PATH_MAX];
 	DIR		*cwd;
 	struct req	 req;
 	char		*p, *path, *subpath;
@@ -1013,7 +1016,7 @@ main(void)
 
 	memset(&req, 0, sizeof(struct req));
 
-	strlcpy(buf, ".", MAXPATHLEN);
+	strlcpy(buf, ".", PATH_MAX);
 	pathgen(cwd, buf, &req);
 	closedir(cwd);
 
@@ -1101,11 +1104,20 @@ static int
 pathstop(DIR *dir)
 {
 	struct dirent	*d;
+#if defined(__sun)
+	struct stat	 sb;
+#endif
 
-	while (NULL != (d = readdir(dir)))
+	while (NULL != (d = readdir(dir))) {
+#if defined(__sun)
+		stat(d->d_name, &sb);
+		if (S_IFREG & sb.st_mode)
+#else
 		if (DT_REG == d->d_type)
+#endif
 			if (0 == strcmp(d->d_name, "catman.conf"))
 				return(1);
+  }
 
 	return(0);
 }
@@ -1122,9 +1134,12 @@ pathgen(DIR *dir, char *path, struct req *req)
 	DIR		*cd;
 	int		 rc;
 	size_t		 sz, ssz;
+#if defined(__sun)
+	struct stat	 sb;
+#endif
 
-	sz = strlcat(path, "/", MAXPATHLEN);
-	if (sz >= MAXPATHLEN) {
+	sz = strlcat(path, "/", PATH_MAX);
+	if (sz >= PATH_MAX) {
 		fprintf(stderr, "%s: Path too long", path);
 		return;
 	} 
@@ -1137,13 +1152,19 @@ pathgen(DIR *dir, char *path, struct req *req)
 
 	rc = 0;
 	while (0 == rc && NULL != (d = readdir(dir))) {
-		if (DT_DIR != d->d_type || strcmp(d->d_name, "etc"))
+#if defined(__sun)
+		stat(d->d_name, &sb);
+		if (!(S_IFDIR & sb.st_mode)
+#else
+		if (DT_DIR != d->d_type
+#endif
+        || strcmp(d->d_name, "etc"))
 			continue;
 
 		path[(int)sz] = '\0';
-		ssz = strlcat(path, d->d_name, MAXPATHLEN);
+		ssz = strlcat(path, d->d_name, PATH_MAX);
 
-		if (ssz >= MAXPATHLEN) {
+		if (ssz >= PATH_MAX) {
 			fprintf(stderr, "%s: Path too long", path);
 			return;
 		} else if (NULL == (cd = opendir(path))) {
@@ -1186,13 +1207,19 @@ pathgen(DIR *dir, char *path, struct req *req)
 
 	rewinddir(dir);
 	while (NULL != (d = readdir(dir))) {
-		if (DT_DIR != d->d_type || '.' == d->d_name[0])
+#if defined(__sun)
+		stat(d->d_name, &sb);
+		if (!(S_IFDIR & sb.st_mode)
+#else
+		if (DT_DIR != d->d_type
+#endif
+        || '.' == d->d_name[0])
 			continue;
 
 		path[(int)sz] = '\0';
-		ssz = strlcat(path, d->d_name, MAXPATHLEN);
+		ssz = strlcat(path, d->d_name, PATH_MAX);
 
-		if (ssz >= MAXPATHLEN) {
+		if (ssz >= PATH_MAX) {
 			fprintf(stderr, "%s: Path too long", path);
 			return;
 		} else if (NULL == (cd = opendir(path))) {