===================================================================
RCS file: /cvs/mandoc/cgi.c,v
retrieving revision 1.52
retrieving revision 1.58
diff -u -p -r1.52 -r1.58
--- mandoc/cgi.c	2014/07/09 07:30:47	1.52
+++ mandoc/cgi.c	2014/07/09 14:18:59	1.58
@@ -1,4 +1,4 @@
-/*	$Id: cgi.c,v 1.52 2014/07/09 07:30:47 schwarze Exp $ */
+/*	$Id: cgi.c,v 1.58 2014/07/09 14:18:59 schwarze Exp $ */
 /*
  * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de>
@@ -20,7 +20,7 @@
 #endif
 
 #include <ctype.h>
-#include <dirent.h>
+#include <errno.h>
 #include <fcntl.h>
 #include <limits.h>
 #include <stdio.h>
@@ -28,13 +28,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#if defined(__sun)
-/* for stat() */
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#endif
-
 #include "mandoc.h"
 #include "mandoc_aux.h"
 #include "main.h"
@@ -52,7 +45,7 @@ enum	page {
  * A query as passed to the search function.
  */
 struct	query {
-	const char	*manroot; /* manual root directory */
+	const char	*manpath; /* desired manual directory */
 	const char	*arch; /* architecture */
 	const char	*sec; /* manual section */
 	const char	*expr; /* unparsed expression string */
@@ -60,10 +53,10 @@ struct	query {
 };
 
 struct	req {
-	struct query	 q;
-	char		**p; /* array of available manroots */
-	size_t		 psz;
-	enum page	 page;
+	struct query	  q;
+	char		**p; /* array of available manpaths */
+	size_t		  psz; /* number of available manpaths */
+	enum page	  page;
 };
 
 static	void		 catman(const struct req *, const char *);
@@ -77,7 +70,7 @@ static	void		 http_parse(struct req *, char *);
 static	void		 http_print(const char *);
 static	void 		 http_putchar(char);
 static	void		 http_printquery(const struct req *);
-static	void		 pathgen(DIR *, struct req *);
+static	void		 pathgen(struct req *);
 static	void		 pg_index(const struct req *, char *);
 static	void		 pg_search(const struct req *, char *);
 static	void		 pg_show(const struct req *, char *);
@@ -93,10 +86,10 @@ static	void		 resp_search(const struct req *,
 				struct manpage *, size_t);
 static	void		 resp_searchform(const struct req *);
 
-static	const char	 *progname; /* cgi script name */
-static	const char	 *cache; /* cache directory */
-static	const char	 *css; /* css directory */
-static	const char	 *host; /* hostname */
+static	const char	 *scriptname; /* CGI script name */
+static	const char	 *mandir; /* contains all manpath directories */
+static	const char	 *cssdir; /* css directory */
+static	const char	 *httphost; /* hostname used in the URIs */
 
 static	const char * const pages[PAGE__MAX] = {
 	"index", /* PAGE_INDEX */ 
@@ -130,29 +123,49 @@ html_putchar(char c)
 		break;
 	}
 }
+
 static void
 http_printquery(const struct req *req)
 {
 
-	printf("&expr=");
-	http_print(req->q.expr ? req->q.expr : "");
-	printf("&sec=");
-	http_print(req->q.sec ? req->q.sec : "");
-	printf("&arch=");
-	http_print(req->q.arch ? req->q.arch : "");
+	if (NULL != req->q.manpath) {
+		printf("&manpath=");
+		http_print(req->q.manpath);
+	}
+	if (NULL != req->q.sec) {
+		printf("&sec=");
+		http_print(req->q.sec);
+	}
+	if (NULL != req->q.arch) {
+		printf("&arch=");
+		http_print(req->q.arch);
+	}
+	if (NULL != req->q.expr) {
+		printf("&expr=");
+		http_print(req->q.expr ? req->q.expr : "");
+	}
 }
 
-
 static void
 html_printquery(const struct req *req)
 {
 
-	printf("&amp;expr=");
-	html_print(req->q.expr ? req->q.expr : "");
-	printf("&amp;sec=");
-	html_print(req->q.sec ? req->q.sec : "");
-	printf("&amp;arch=");
-	html_print(req->q.arch ? req->q.arch : "");
+	if (NULL != req->q.manpath) {
+		printf("&amp;manpath=");
+		html_print(req->q.manpath);
+	}
+	if (NULL != req->q.sec) {
+		printf("&amp;sec=");
+		html_print(req->q.sec);
+	}
+	if (NULL != req->q.arch) {
+		printf("&amp;arch=");
+		html_print(req->q.arch);
+	}
+	if (NULL != req->q.expr) {
+		printf("&amp;expr=");
+		html_print(req->q.expr ? req->q.expr : "");
+	}
 }
 
 static void
@@ -191,7 +204,7 @@ http_parse(struct req *req, char *p)
 	int		 legacy;
 
 	memset(&req->q, 0, sizeof(struct query));
-	req->q.manroot = req->p[0];
+	req->q.manpath = req->p[0];
 
 	legacy = -1;
 	while ('\0' != *p) {
@@ -225,7 +238,7 @@ http_parse(struct req *req, char *p)
 		else if (0 == strcmp(key, "arch"))
 			req->q.arch = val;
 		else if (0 == strcmp(key, "manpath"))
-			req->q.manroot = val;
+			req->q.manpath = val;
 		else if (0 == strcmp(key, "apropos"))
 			legacy = 0 == strcmp(val, "0");
 	}
@@ -330,7 +343,8 @@ resp_begin_html(int code, const char *msg)
 	       "<TITLE>System Manpage Reference</TITLE>\n"
 	       "</HEAD>\n"
 	       "<BODY>\n"
-	       "<!-- Begin page content. //-->\n", css, css);
+	       "<!-- Begin page content. //-->\n",
+	       cssdir, cssdir);
 }
 
 static void
@@ -354,7 +368,7 @@ resp_searchform(const struct req *req)
 	       "<INPUT TYPE=\"submit\" "
 	       " VALUE=\"Search\"> for manuals satisfying \n"
 	       "<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"",
-	       progname);
+	       scriptname);
 	html_print(req->q.expr ? req->q.expr : "");
 	printf("\">, section "
 	       "<INPUT TYPE=\"text\""
@@ -369,8 +383,8 @@ resp_searchform(const struct req *req)
 		puts(", <SELECT NAME=\"manpath\">");
 		for (i = 0; i < (int)req->psz; i++) {
 			printf("<OPTION ");
-			if (NULL == req->q.manroot ? 0 == i :
-			    0 == strcmp(req->q.manroot, req->p[i]))
+			if (NULL == req->q.manpath ? 0 == i :
+			    0 == strcmp(req->q.manpath, req->p[i]))
 				printf("SELECTED=\"selected\" ");
 			printf("VALUE=\"");
 			html_print(req->p[i]);
@@ -407,7 +421,7 @@ resp_error400(void)
 	       "The query your entered was malformed.\n"
 	       "Try again from the\n"
 	       "<A HREF=\"%s/index.html\">main page</A>.\n"
-	       "</P>", progname);
+	       "</P>", scriptname);
 	resp_end_html();
 }
 
@@ -424,8 +438,8 @@ resp_error404(const char *page)
 	printf("</B>,\n"
 	       "could not be found.\n"
 	       "Try searching from the\n"
-	       "<A HREF=\"%s/index.html\">main page</A>.\n"
-	       "</P>", progname);
+	       "<A HREF=\"%s\">main page</A>.\n"
+	       "</P>", scriptname);
 	resp_end_html();
 }
 
@@ -433,7 +447,7 @@ static void
 resp_bad(void)
 {
 	resp_begin_html(500, "Internal Server Error");
-	puts("<P>Generic badness happened.</P>");
+	puts("<P>Internal Server Error</P>");
 	resp_end_html();
 }
 
@@ -458,7 +472,7 @@ resp_search(const struct req *req, struct manpage *r, 
 		 */
 		puts("Status: 303 See Other");
 		printf("Location: http://%s%s/show/%s/%s?",
-		    host, progname, req->q.manroot, r[0].file);
+		    httphost, scriptname, req->q.manpath, r[0].file);
 		http_printquery(req);
 		puts("\n"
 		     "Content-Type: text/html; charset=utf-8\n");
@@ -487,7 +501,7 @@ resp_search(const struct req *req, struct manpage *r, 
 		printf("<TR>\n"
 		       "<TD CLASS=\"title\">\n"
 		       "<A HREF=\"%s/show/%s/%s?", 
-		    progname, req->q.manroot, r[i].file);
+		    scriptname, req->q.manpath, r[i].file);
 		html_printquery(req);
 		printf("\">");
 		html_print(r[i].names);
@@ -664,7 +678,8 @@ format(const struct req *req, const char *file)
 		return;
 	}
 
-	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL, NULL);
+	mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_FATAL, NULL,
+	    req->q.manpath);
 	rc = mparse_readfd(mp, fd, file);
 	close(fd);
 
@@ -675,7 +690,7 @@ format(const struct req *req, const char *file)
 
 	snprintf(opts, sizeof(opts),
 	    "fragment,man=%s/search?sec=%%S&expr=Nm~^%%N$",
-	    progname);
+	    scriptname);
 
 	mparse_result(mp, &mdoc, &man, NULL);
 	if (NULL == man && NULL == mdoc) {
@@ -713,7 +728,7 @@ pg_show(const struct req *req, char *path)
 	*sub++ = '\0';
 
 	/*
-	 * Begin by chdir()ing into the manroot.
+	 * Begin by chdir()ing into the manpath.
 	 * This way we can pick up the database files, which are
 	 * relative to the manpath root.
 	 */
@@ -747,8 +762,8 @@ pg_search(const struct req *req, char *path)
 	 * relative to the manpath root.
 	 */
 
-	if (-1 == (chdir(req->q.manroot))) {
-		perror(req->q.manroot);
+	if (-1 == (chdir(req->q.manpath))) {
+		perror(req->q.manpath);
 		resp_search(req, NULL, 0);
 		return;
 	}
@@ -809,49 +824,43 @@ int
 main(void)
 {
 	int		 i;
-	DIR		*cwd;
 	struct req	 req;
-	char		*p, *path, *subpath;
+	char		*querystring, *path, *subpath;
 
 	/* Scan our run-time environment. */
 
-	if (NULL == (cache = getenv("CACHE_DIR")))
-		cache = "/cache/man.cgi";
+	if (NULL == (mandir = getenv("MAN_DIR")))
+		mandir = "/man";
 
-	if (NULL == (progname = getenv("SCRIPT_NAME")))
-		progname = "";
+	if (NULL == (scriptname = getenv("SCRIPT_NAME")))
+		scriptname = "";
 
-	if (NULL == (css = getenv("CSS_DIR")))
-		css = "";
+	if (NULL == (cssdir = getenv("CSS_DIR")))
+		cssdir = "";
 
-	if (NULL == (host = getenv("HTTP_HOST")))
-		host = "localhost";
+	if (NULL == (httphost = getenv("HTTP_HOST")))
+		httphost = "localhost";
 
 	/*
-	 * First we change directory into the cache directory so that
+	 * First we change directory into the mandir so that
 	 * subsequent scanning for manpath directories is rooted
 	 * relative to the same position.
 	 */
 
-	if (-1 == chdir(cache)) {
-		perror(cache);
+	if (-1 == chdir(mandir)) {
+		fprintf(stderr, "MAN_DIR: %s: %s\n",
+		    mandir, strerror(errno));
 		resp_bad();
 		return(EXIT_FAILURE);
-	} else if (NULL == (cwd = opendir(cache))) {
-		perror(cache);
-		resp_bad();
-		return(EXIT_FAILURE);
 	} 
 
 	memset(&req, 0, sizeof(struct req));
+	pathgen(&req);
 
-	pathgen(cwd, &req);
-	closedir(cwd);
-
 	/* Next parse out the query string. */
 
-	if (NULL != (p = getenv("QUERY_STRING")))
-		http_parse(&req, p);
+	if (NULL != (querystring = getenv("QUERY_STRING")))
+		http_parse(&req, querystring);
 
 	/*
 	 * Now juggle paths to extract information.
@@ -918,24 +927,20 @@ cmp(const void *p1, const void *p2)
  * Scan for indexable paths.
  */
 static void
-pathgen(DIR *dir, struct req *req)
+pathgen(struct req *req)
 {
-	struct dirent	*d;
-#if defined(__sun)
-	struct stat	 sb;
-#endif
+	FILE	*fp;
+	char	*dp;
+	size_t	 dpsz;
 
-	while (NULL != (d = readdir(dir))) {
-#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]) {
-			req->p = mandoc_realloc(req->p,
-			    (req->psz + 1) * sizeof(char *));
-			req->p[req->psz++] = mandoc_strdup(d->d_name);
-		}
+	if (NULL == (fp = fopen("manpath.conf", "r")))
+		return;
+
+	while (NULL != (dp = fgetln(fp, &dpsz))) {
+		if ('\n' == dp[dpsz - 1])
+			dpsz--;
+		req->p = mandoc_realloc(req->p,
+		    (req->psz + 1) * sizeof(char *));
+		req->p[req->psz++] = mandoc_strndup(dp, dpsz);
 	}
 }