=================================================================== RCS file: /cvs/mandoc/cgi.c,v retrieving revision 1.65 retrieving revision 1.68 diff -u -p -r1.65 -r1.68 --- mandoc/cgi.c 2014/07/12 16:14:35 1.65 +++ mandoc/cgi.c 2014/07/12 23:46:44 1.68 @@ -1,4 +1,4 @@ -/* $Id: cgi.c,v 1.65 2014/07/12 16:14:35 schwarze Exp $ */ +/* $Id: cgi.c,v 1.68 2014/07/12 23:46:44 schwarze Exp $ */ /* * Copyright (c) 2011, 2012 Kristaps Dzonsons * Copyright (c) 2014 Ingo Schwarze @@ -33,14 +33,8 @@ #include "main.h" #include "manpath.h" #include "mansearch.h" +#include "cgi.h" -enum page { - PAGE_INDEX, - PAGE_SEARCH, - PAGE_SHOW, - PAGE__MAX -}; - /* * A query as passed to the search function. */ @@ -56,7 +50,6 @@ struct req { 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 *); @@ -71,15 +64,13 @@ static void http_print(const char *); static void http_putchar(char); static void http_printquery(const 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 *); +static void pg_search(const struct req *); +static void pg_show(const struct req *, const char *); static void resp_begin_html(int, const char *); static void resp_begin_http(int, const char *); static void resp_end_html(void); static void resp_error_badrequest(const char *); static void resp_error_internal(void); -static void resp_error_notfound(const char *); static void resp_index(const struct req *); static void resp_noresult(const struct req *, const char *); @@ -88,16 +79,41 @@ static void resp_search(const struct req *, static void resp_searchform(const struct req *); 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 */ - "search", /* PAGE_SEARCH */ - "show", /* PAGE_SHOW */ +static const char *const sec_numbers[] = { + "0", "1", "2", "3", "3p", "4", "5", "6", "7", "8", "9" }; +static const char *const sec_names[] = { + "All Sections", + "1 - General Commands", + "2 - System Calls", + "3 - Subroutines", + "3p - Perl Subroutines", + "4 - Special Files", + "5 - File Formats", + "6 - Games", + "7 - Macros and Conventions", + "8 - Maintenance Commands", + "9 - Kernel Interface" +}; +static const int sec_MAX = sizeof(sec_names) / sizeof(char *); +static const char *const arch_names[] = { + "amd64", "alpha", "armish", "armv7", + "aviion", "hppa", "hppa64", "i386", + "ia64", "landisk", "loongson", "luna88k", + "macppc", "mips64", "octeon", "sgi", + "socppc", "solbourne", "sparc", "sparc64", + "vax", "zaurus", + "amiga", "arc", "arm32", "atari", + "beagle", "cats", "hp300", "mac68k", + "mvme68k", "mvme88k", "mvmeppc", "palm", + "pc532", "pegasos", "pmax", "powerpc", + "sun3", "wgrisc", "x68k" +}; +static const int arch_MAX = sizeof(arch_names) / sizeof(char *); + /* * Print a character, escaping HTML along the way. * This will pass non-ASCII straight to output: be warned! @@ -330,11 +346,11 @@ resp_begin_html(int code, const char *msg) " TYPE=\"text/css\" media=\"all\">\n" "\n" - "System Manpage Reference\n" + "%s\n" "\n" "\n" "\n", - cssdir, cssdir); + CSS_DIR, CSS_DIR, CUSTOMIZE_TITLE); } static void @@ -350,42 +366,70 @@ resp_searchform(const struct req *req) { int i; + puts(CUSTOMIZE_BEGIN); puts(""); printf("
\n" - "
\n" + "\n" "
\n" - "Search Parameters\n" - " " - "for manuals \n", + "Manual Page Search Parameters\n", scriptname); - printf("q.expr) + html_print(req->q.expr); + puts("\" SIZE=\"40\">"); + + /* Write submission and reset buttons. */ + + printf( "\n" + "\n"); + + /* Write show radio button */ + + printf( "\n" + "q.equal) - printf(" SELECTED=\"selected\""); - printf(">named\n" - "\n" - "\n" - "q.expr ? req->q.expr : ""); - printf("\">, section " - "q.sec ? req->q.sec : ""); - printf("\">, arch " - "q.arch ? req->q.arch : ""); - printf("\">"); + printf("CHECKED "); + printf( "NAME=\"apropos\" ID=\"show\" VALUE=\"0\">\n" + "\n"); + + /* Write section selector. */ + + printf( "\n" + ""); + + /* Write architecture selector. */ + + puts(""); + + /* Write manpath selector. */ + if (req->psz > 1) { - puts(", in "); for (i = 0; i < (int)req->psz; i++) { printf("
\n" "
\n" "
"); @@ -407,16 +460,12 @@ resp_index(const struct req *req) { resp_begin_html(200, NULL); - puts("

\n" - "Online manuals with " - "mandoc\n" - "

"); resp_searchform(req); printf("

\n" "This web interface is documented in the " - "" + "" "man.cgi manual, and the " - "" + "" "apropos manual explains the query syntax.\n" "

\n", scriptname, scriptname); @@ -449,24 +498,6 @@ resp_error_badrequest(const char *msg) } static void -resp_error_notfound(const char *page) -{ - - resp_begin_html(404, "Not Found"); - puts("

Page Not Found

\n" - "

\n" - "The page you're looking for, "); - printf(""); - html_print(page); - printf(",\n" - "could not be found.\n" - "Try searching from the\n" - "main page.\n" - "

", scriptname); - resp_end_html(); -} - -static void resp_error_internal(void) { resp_begin_html(500, "Internal Server Error"); @@ -485,7 +516,7 @@ resp_search(const struct req *req, struct manpage *r, * without any delay. */ printf("Status: 303 See Other\r\n"); - printf("Location: http://%s%s/show/%s/%s?", + printf("Location: http://%s%s/%s/%s?", httphost, scriptname, req->q.manpath, r[0].file); http_printquery(req); printf("\r\n" @@ -504,7 +535,7 @@ resp_search(const struct req *req, struct manpage *r, for (i = 0; i < sz; i++) { printf("\n" "\n" - "q.manpath, r[i].file); html_printquery(req); printf("\">"); @@ -522,15 +553,7 @@ resp_search(const struct req *req, struct manpage *r, resp_end_html(); } -/* ARGSUSED */ static void -pg_index(const struct req *req, char *path) -{ - - resp_index(req); -} - -static void catman(const struct req *req, const char *file) { FILE *f; @@ -697,7 +720,7 @@ format(const struct req *req, const char *file) } snprintf(opts, sizeof(opts), - "fragment,man=%s/search?sec=%%S&expr=Nm~^%%N$", + "fragment,man=%s?query=%%N&sec=%%S", scriptname); mparse_result(mp, &mdoc, &man, NULL); @@ -727,7 +750,7 @@ format(const struct req *req, const char *file) } static void -pg_show(const struct req *req, char *path) +pg_show(const struct req *req, const char *path) { char *sub; @@ -757,7 +780,7 @@ pg_show(const struct req *req, char *path) } static void -pg_search(const struct req *req, char *path) +pg_search(const struct req *req) { struct mansearch search; struct manpaths paths; @@ -836,33 +859,28 @@ pg_search(const struct req *req, char *path) int main(void) { - int i; struct req req; - char *querystring, *path, *subpath; + const char *path; + char *querystring; + int i; /* Scan our run-time environment. */ - if (NULL == (mandir = getenv("MAN_DIR"))) - mandir = "/man"; - if (NULL == (scriptname = getenv("SCRIPT_NAME"))) scriptname = ""; - if (NULL == (cssdir = getenv("CSS_DIR"))) - cssdir = ""; - if (NULL == (httphost = getenv("HTTP_HOST"))) httphost = "localhost"; /* - * First we change directory into the mandir so that + * First we change directory into the MAN_DIR so that * subsequent scanning for manpath directories is rooted * relative to the same position. */ - if (-1 == chdir(mandir)) { + if (-1 == chdir(MAN_DIR)) { fprintf(stderr, "MAN_DIR: %s: %s\n", - mandir, strerror(errno)); + MAN_DIR, strerror(errno)); resp_error_internal(); return(EXIT_FAILURE); } @@ -875,52 +893,20 @@ main(void) if (NULL != (querystring = getenv("QUERY_STRING"))) http_parse(&req, querystring); - /* - * Now juggle paths to extract information. - * We want to extract our filetype (the file suffix), the - * initial path component, then the trailing component(s). - * Start with leading subpath component. - */ + /* Dispatch to the three different pages. */ - subpath = path = NULL; - req.page = PAGE__MAX; + path = getenv("PATH_INFO"); + if (NULL == path) + path = ""; + else if ('/' == *path) + path++; - if (NULL == (path = getenv("PATH_INFO")) || '\0' == *path) - req.page = PAGE_INDEX; - - if (NULL != path && '/' == *path && '\0' == *++path) - req.page = PAGE_INDEX; - - /* Resolve subpath component. */ - - if (NULL != path && NULL != (subpath = strchr(path, '/'))) - *subpath++ = '\0'; - - /* Map path into one we recognise. */ - - if (NULL != path && '\0' != *path) - for (i = 0; i < (int)PAGE__MAX; i++) - if (0 == strcmp(pages[i], path)) { - req.page = (enum page)i; - break; - } - - /* Route pages. */ - - switch (req.page) { - case (PAGE_INDEX): - pg_index(&req, subpath); - break; - case (PAGE_SEARCH): - pg_search(&req, subpath); - break; - case (PAGE_SHOW): - pg_show(&req, subpath); - break; - default: - resp_error_notfound(path); - break; - } + if ('\0' != *path) + pg_show(&req, path); + else if (NULL != req.q.expr) + pg_search(&req); + else + resp_index(&req); for (i = 0; i < (int)req.psz; i++) free(req.p[i]);