version 1.35, 2011/12/16 12:06:35 |
version 1.40, 2012/03/23 09:03:07 |
|
|
#include "man.h" |
#include "man.h" |
#include "main.h" |
#include "main.h" |
#include "manpath.h" |
#include "manpath.h" |
|
#include "mandocdb.h" |
|
|
#ifdef __linux__ |
#ifdef __linux__ |
# include <db_185.h> |
# include <db_185.h> |
|
|
const char *sec; /* manual section */ |
const char *sec; /* manual section */ |
const char *expr; /* unparsed expression string */ |
const char *expr; /* unparsed expression string */ |
int manroot; /* manroot index (or -1)*/ |
int manroot; /* manroot index (or -1)*/ |
int whatis; /* whether whatis mode */ |
|
int legacy; /* whether legacy mode */ |
int legacy; /* whether legacy mode */ |
}; |
}; |
|
|
Line 84 static void catman(const struct req *, const char *) |
|
Line 84 static void catman(const struct req *, const char *) |
|
static int cmp(const void *, const void *); |
static int cmp(const void *, const void *); |
static void format(const struct req *, const char *); |
static void format(const struct req *, const char *); |
static void html_print(const char *); |
static void html_print(const char *); |
|
static void html_printquery(const struct req *); |
static void html_putchar(char); |
static void html_putchar(char); |
static int http_decode(char *); |
static int http_decode(char *); |
static void http_parse(struct req *, char *); |
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 int pathstop(DIR *); |
static int pathstop(DIR *); |
static void pathgen(DIR *, char *, struct req *); |
static void pathgen(DIR *, char *, struct req *); |
static void pg_index(const struct req *, char *); |
static void pg_index(const struct req *, char *); |
Line 130 atou(const char *buf, unsigned *v) |
|
Line 134 atou(const char *buf, unsigned *v) |
|
return(0); |
return(0); |
if ((errno == ERANGE && (lval == LONG_MAX || |
if ((errno == ERANGE && (lval == LONG_MAX || |
lval == LONG_MIN)) || |
lval == LONG_MIN)) || |
(lval > UINT_MAX || lval < 0)) |
(lval > INT_MAX || lval < 0)) |
return(0); |
return(0); |
|
|
*v = (unsigned int)lval; |
*v = (unsigned int)lval; |
Line 163 html_putchar(char c) |
|
Line 167 html_putchar(char c) |
|
break; |
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 : ""); |
|
} |
|
|
|
|
|
static void |
|
html_printquery(const struct req *req) |
|
{ |
|
|
|
printf("&expr="); |
|
html_print(req->q.expr ? req->q.expr : ""); |
|
printf("&sec="); |
|
html_print(req->q.sec ? req->q.sec : ""); |
|
printf("&arch="); |
|
html_print(req->q.arch ? req->q.arch : ""); |
|
} |
|
|
|
static void |
|
http_print(const char *p) |
|
{ |
|
|
|
if (NULL == p) |
|
return; |
|
while ('\0' != *p) |
|
http_putchar(*p++); |
|
} |
|
|
/* |
/* |
* Call through to html_putchar(). |
* Call through to html_putchar(). |
* Accepts NULL strings. |
* Accepts NULL strings. |
|
|
http_parse(struct req *req, char *p) |
http_parse(struct req *req, char *p) |
{ |
{ |
char *key, *val, *manroot; |
char *key, *val, *manroot; |
size_t sz; |
|
int i, legacy; |
int i, legacy; |
|
|
memset(&req->q, 0, sizeof(struct query)); |
memset(&req->q, 0, sizeof(struct query)); |
|
|
req->q.whatis = 1; |
|
legacy = -1; |
legacy = -1; |
manroot = NULL; |
manroot = NULL; |
|
|
while (p && '\0' != *p) { |
while ('\0' != *p) { |
while (' ' == *p) |
|
p++; |
|
|
|
key = p; |
key = p; |
val = NULL; |
val = NULL; |
|
|
if (NULL != (p = strchr(p, '='))) { |
p += (int)strcspn(p, ";&"); |
|
if ('\0' != *p) |
*p++ = '\0'; |
*p++ = '\0'; |
val = p; |
if (NULL != (val = strchr(key, '='))) |
|
*val++ = '\0'; |
|
|
sz = strcspn(p, ";&"); |
if ('\0' == *key || NULL == val || '\0' == *val) |
/* LINTED */ |
|
p += sz; |
|
|
|
if ('\0' != *p) |
|
*p++ = '\0'; |
|
} else { |
|
p = key; |
|
sz = strcspn(p, ";&"); |
|
/* LINTED */ |
|
p += sz; |
|
|
|
if ('\0' != *p) |
|
p++; |
|
continue; |
continue; |
} |
|
|
|
if ('\0' == *key || '\0' == *val) |
|
continue; |
|
|
|
/* Just abort handling. */ |
/* Just abort handling. */ |
|
|
if ( ! http_decode(key)) |
if ( ! http_decode(key)) |
break; |
break; |
if ( ! http_decode(val)) |
if (NULL != val && ! http_decode(val)) |
break; |
break; |
|
|
if (0 == strcmp(key, "expr")) |
if (0 == strcmp(key, "expr")) |
Line 248 http_parse(struct req *req, char *p) |
|
Line 266 http_parse(struct req *req, char *p) |
|
manroot = val; |
manroot = val; |
else if (0 == strcmp(key, "apropos")) |
else if (0 == strcmp(key, "apropos")) |
legacy = 0 == strcmp(val, "0"); |
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. */ |
/* Test for old man.cgi compatibility mode. */ |
|
|
if (legacy == 0) { |
req->q.legacy = legacy > 0; |
req->q.whatis = 0; |
|
req->q.legacy = 1; |
|
} else if (legacy > 0) { |
|
req->q.legacy = 1; |
|
req->q.whatis = 1; |
|
} |
|
|
|
/* |
/* |
* Section "0" means no section when in legacy mode. |
* Section "0" means no section when in legacy mode. |
Line 284 http_parse(struct req *req, char *p) |
|
Line 294 http_parse(struct req *req, char *p) |
|
} |
} |
} |
} |
|
|
|
static void |
|
http_putchar(char c) |
|
{ |
|
|
|
if (isalnum((unsigned char)c)) { |
|
putchar((unsigned char)c); |
|
return; |
|
} else if (' ' == c) { |
|
putchar('+'); |
|
return; |
|
} |
|
printf("%%%.2x", c); |
|
} |
|
|
/* |
/* |
* HTTP-decode a string. The standard explanation is that this turns |
* HTTP-decode a string. The standard explanation is that this turns |
* "%4e+foo" into "n foo" in the regular way. This is done in-place |
* "%4e+foo" into "n foo" in the regular way. This is done in-place |
Line 374 resp_searchform(const struct req *req) |
|
Line 398 resp_searchform(const struct req *req) |
|
"<FORM ACTION=\"%s/search.html\" METHOD=\"get\">\n" |
"<FORM ACTION=\"%s/search.html\" METHOD=\"get\">\n" |
"<FIELDSET>\n" |
"<FIELDSET>\n" |
"<LEGEND>Search Parameters</LEGEND>\n" |
"<LEGEND>Search Parameters</LEGEND>\n" |
"<INPUT TYPE=\"submit\" NAME=\"op\"" |
"<INPUT TYPE=\"submit\" " |
" VALUE=\"Whatis\"> or \n" |
" VALUE=\"Search\"> for manuals satisfying \n" |
"<INPUT TYPE=\"submit\" NAME=\"op\"" |
|
" VALUE=\"apropos\"> for manuals satisfying \n" |
|
"<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"", |
"<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"", |
progname); |
progname); |
html_print(req->q.expr ? req->q.expr : ""); |
html_print(req->q.expr ? req->q.expr : ""); |
Line 477 resp_search(struct res *r, size_t sz, void *arg) |
|
Line 499 resp_search(struct res *r, size_t sz, void *arg) |
|
const struct req *req; |
const struct req *req; |
|
|
req = (const struct req *)arg; |
req = (const struct req *)arg; |
assert(req->q.manroot >= 0); |
|
|
|
|
if (sz > 0) |
|
assert(req->q.manroot >= 0); |
|
|
if (1 == sz) { |
if (1 == sz) { |
/* |
/* |
* If we have just one result, then jump there now |
* If we have just one result, then jump there now |
* without any delay. |
* without any delay. |
*/ |
*/ |
puts("Status: 303 See Other"); |
puts("Status: 303 See Other"); |
printf("Location: http://%s%s/show/%d/%u/%u.html\n", |
printf("Location: http://%s%s/show/%d/%u/%u.html?", |
host, progname, req->q.manroot, |
host, progname, req->q.manroot, |
r[0].volume, r[0].rec); |
r[0].volume, r[0].rec); |
puts("Content-Type: text/html; charset=utf-8\n"); |
http_printquery(req); |
|
puts("\n" |
|
"Content-Type: text/html; charset=utf-8\n"); |
return; |
return; |
} |
} |
|
|
Line 500 resp_search(struct res *r, size_t sz, void *arg) |
|
Line 526 resp_search(struct res *r, size_t sz, void *arg) |
|
puts("<DIV CLASS=\"results\">"); |
puts("<DIV CLASS=\"results\">"); |
|
|
if (0 == sz) { |
if (0 == sz) { |
printf("<P>\n" |
puts("<P>\n" |
"No %s results found.\n", |
"No results found.\n" |
req->q.whatis ? "whatis" : "apropos"); |
"</P>\n" |
if (req->q.whatis) { |
"</DIV>"); |
printf("(Try <A HREF=\"%s/search.html?" |
|
"op=apropos&expr=", progname); |
|
html_print(req->q.expr ? req->q.expr : ""); |
|
printf("&sec="); |
|
html_print(req->q.sec ? req->q.sec : ""); |
|
printf("&arch="); |
|
html_print(req->q.arch ? req->q.arch : ""); |
|
puts("\">apropos</A>?)"); |
|
} |
|
puts("</P>"); |
|
puts("</DIV>"); |
|
resp_end_html(); |
resp_end_html(); |
return; |
return; |
} |
} |
Line 524 resp_search(struct res *r, size_t sz, void *arg) |
|
Line 539 resp_search(struct res *r, size_t sz, void *arg) |
|
for (i = 0; i < (int)sz; i++) { |
for (i = 0; i < (int)sz; i++) { |
printf("<TR>\n" |
printf("<TR>\n" |
"<TD CLASS=\"title\">\n" |
"<TD CLASS=\"title\">\n" |
"<A HREF=\"%s/show/%d/%u/%u.html\">", |
"<A HREF=\"%s/show/%d/%u/%u.html?", |
progname, req->q.manroot, |
progname, req->q.manroot, |
r[i].volume, r[i].rec); |
r[i].volume, r[i].rec); |
|
html_printquery(req); |
|
printf("\">"); |
html_print(r[i].title); |
html_print(r[i].title); |
putchar('('); |
putchar('('); |
html_print(r[i].cat); |
html_print(r[i].cat); |
Line 807 pg_show(const struct req *req, char *path) |
|
Line 824 pg_show(const struct req *req, char *path) |
|
|
|
sz = strlcpy(file, ps.paths[vol], MAXPATHLEN); |
sz = strlcpy(file, ps.paths[vol], MAXPATHLEN); |
assert(sz < MAXPATHLEN); |
assert(sz < MAXPATHLEN); |
strlcat(file, "/mandoc.index", MAXPATHLEN); |
strlcat(file, "/", MAXPATHLEN); |
|
strlcat(file, MANDOC_IDX, MAXPATHLEN); |
|
|
/* Open the index recno(3) database. */ |
/* Open the index recno(3) database. */ |
|
|
Line 915 pg_search(const struct req *req, char *path) |
|
Line 933 pg_search(const struct req *req, char *path) |
|
* The resp_search() function is called with the results. |
* 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); |
termcomp(sz, cp, &tt) : exprcomp(sz, cp, &tt); |
|
|
if (NULL != expr) |
if (NULL != expr) |