version 1.61, 2014/07/10 00:52:50 |
version 1.65, 2014/07/12 16:14:35 |
|
|
const char *arch; /* architecture */ |
const char *arch; /* architecture */ |
const char *sec; /* manual section */ |
const char *sec; /* manual section */ |
const char *expr; /* unparsed expression string */ |
const char *expr; /* unparsed expression string */ |
int legacy; /* whether legacy mode */ |
int equal; /* match whole names, not substrings */ |
}; |
}; |
|
|
struct req { |
struct req { |
Line 142 http_printquery(const struct req *req) |
|
Line 142 http_printquery(const struct req *req) |
|
http_print(req->q.arch); |
http_print(req->q.arch); |
} |
} |
if (NULL != req->q.expr) { |
if (NULL != req->q.expr) { |
printf("&expr="); |
printf("&query="); |
http_print(req->q.expr ? req->q.expr : ""); |
http_print(req->q.expr); |
} |
} |
|
if (0 == req->q.equal) |
|
printf("&apropos=1"); |
} |
} |
|
|
static void |
static void |
Line 164 html_printquery(const struct req *req) |
|
Line 166 html_printquery(const struct req *req) |
|
html_print(req->q.arch); |
html_print(req->q.arch); |
} |
} |
if (NULL != req->q.expr) { |
if (NULL != req->q.expr) { |
printf("&expr="); |
printf("&query="); |
html_print(req->q.expr ? req->q.expr : ""); |
html_print(req->q.expr); |
} |
} |
|
if (0 == req->q.equal) |
|
printf("&apropos=1"); |
} |
} |
|
|
static void |
static void |
|
|
http_parse(struct req *req, char *p) |
http_parse(struct req *req, char *p) |
{ |
{ |
char *key, *val; |
char *key, *val; |
int legacy; |
|
|
|
memset(&req->q, 0, sizeof(struct query)); |
memset(&req->q, 0, sizeof(struct query)); |
req->q.manpath = req->p[0]; |
req->q.manpath = req->p[0]; |
|
req->q.equal = 1; |
|
|
legacy = -1; |
|
while ('\0' != *p) { |
while ('\0' != *p) { |
key = p; |
key = p; |
val = NULL; |
val = NULL; |
Line 228 http_parse(struct req *req, char *p) |
|
Line 231 http_parse(struct req *req, char *p) |
|
if (NULL != val && ! http_decode(val)) |
if (NULL != val && ! http_decode(val)) |
break; |
break; |
|
|
if (0 == strcmp(key, "expr")) |
if (0 == strcmp(key, "query")) |
req->q.expr = val; |
req->q.expr = val; |
else if (0 == strcmp(key, "query")) |
|
req->q.expr = val; |
|
else if (0 == strcmp(key, "sec")) |
|
req->q.sec = val; |
|
else if (0 == strcmp(key, "sektion")) |
|
req->q.sec = val; |
|
else if (0 == strcmp(key, "arch")) |
|
req->q.arch = val; |
|
else if (0 == strcmp(key, "manpath")) |
else if (0 == strcmp(key, "manpath")) |
req->q.manpath = val; |
req->q.manpath = val; |
else if (0 == strcmp(key, "apropos")) |
else if (0 == strcmp(key, "apropos")) |
legacy = 0 == strcmp(val, "0"); |
req->q.equal = !strcmp(val, "0"); |
|
else if (0 == strcmp(key, "sec") || |
|
0 == strcmp(key, "sektion")) { |
|
if (strcmp(val, "0")) |
|
req->q.sec = val; |
|
} else if (0 == strcmp(key, "arch")) { |
|
if (strcmp(val, "default")) |
|
req->q.arch = val; |
|
} |
} |
} |
|
|
/* Test for old man.cgi compatibility mode. */ |
|
|
|
req->q.legacy = legacy > 0; |
|
|
|
/* |
|
* Section "0" means no section when in legacy mode. |
|
* For some man.cgi scripts, "default" arch is none. |
|
*/ |
|
|
|
if (req->q.legacy && NULL != req->q.sec) |
|
if (0 == strcmp(req->q.sec, "0")) |
|
req->q.sec = NULL; |
|
if (req->q.legacy && NULL != req->q.arch) |
|
if (0 == strcmp(req->q.arch, "default")) |
|
req->q.arch = NULL; |
|
} |
} |
|
|
static void |
static void |
|
|
http_decode(char *p) |
http_decode(char *p) |
{ |
{ |
char hex[3]; |
char hex[3]; |
|
char *q; |
int c; |
int c; |
|
|
hex[2] = '\0'; |
hex[2] = '\0'; |
|
|
for ( ; '\0' != *p; p++) { |
q = p; |
|
for ( ; '\0' != *p; p++, q++) { |
if ('%' == *p) { |
if ('%' == *p) { |
if ('\0' == (hex[0] = *(p + 1))) |
if ('\0' == (hex[0] = *(p + 1))) |
return(0); |
return(0); |
Line 299 http_decode(char *p) |
|
Line 288 http_decode(char *p) |
|
if ('\0' == c) |
if ('\0' == c) |
return(0); |
return(0); |
|
|
*p = (char)c; |
*q = (char)c; |
memmove(p + 1, p + 3, strlen(p + 3) + 1); |
p += 2; |
} else |
} else |
*p = '+' == *p ? ' ' : *p; |
*q = '+' == *p ? ' ' : *p; |
} |
} |
|
|
*p = '\0'; |
*q = '\0'; |
return(1); |
return(1); |
} |
} |
|
|
Line 314 resp_begin_http(int code, const char *msg) |
|
Line 303 resp_begin_http(int code, const char *msg) |
|
{ |
{ |
|
|
if (200 != code) |
if (200 != code) |
printf("Status: %d %s\n", code, msg); |
printf("Status: %d %s\r\n", code, msg); |
|
|
puts("Content-Type: text/html; charset=utf-8\n" |
printf("Content-Type: text/html; charset=utf-8\r\n" |
"Cache-Control: no-cache\n" |
"Cache-Control: no-cache\r\n" |
"Pragma: no-cache\n" |
"Pragma: no-cache\r\n" |
""); |
"\r\n"); |
|
|
fflush(stdout); |
fflush(stdout); |
} |
} |
Line 366 resp_searchform(const struct req *req) |
|
Line 355 resp_searchform(const struct req *req) |
|
"<FORM ACTION=\"%s/search\" METHOD=\"get\">\n" |
"<FORM ACTION=\"%s/search\" METHOD=\"get\">\n" |
"<FIELDSET>\n" |
"<FIELDSET>\n" |
"<LEGEND>Search Parameters</LEGEND>\n" |
"<LEGEND>Search Parameters</LEGEND>\n" |
"<INPUT TYPE=\"submit\" " |
"<INPUT TYPE=\"submit\" VALUE=\"Search\"> " |
" VALUE=\"Search\"> for manuals matching \n" |
"for manuals \n", |
"<INPUT TYPE=\"text\" NAME=\"expr\" VALUE=\"", |
|
scriptname); |
scriptname); |
|
printf("<SELECT NAME=\"apropos\">\n" |
|
"<OPTION VALUE=\"0\""); |
|
if (req->q.equal) |
|
printf(" SELECTED=\"selected\""); |
|
printf(">named</OPTION>\n" |
|
"<OPTION VALUE=\"1\""); |
|
if (0 == req->q.equal) |
|
printf(" SELECTED=\"selected\""); |
|
printf(">matching</OPTION>\n" |
|
"</SELECT>\n" |
|
"<INPUT TYPE=\"text\" NAME=\"query\" VALUE=\""); |
html_print(req->q.expr ? req->q.expr : ""); |
html_print(req->q.expr ? req->q.expr : ""); |
printf("\">, section " |
printf("\">, section " |
"<INPUT TYPE=\"text\"" |
"<INPUT TYPE=\"text\"" |
Line 413 resp_index(const struct req *req) |
|
Line 412 resp_index(const struct req *req) |
|
"<A HREF=\"http://mdocml.bsd.lv/\">mandoc</A>\n" |
"<A HREF=\"http://mdocml.bsd.lv/\">mandoc</A>\n" |
"</H1>"); |
"</H1>"); |
resp_searchform(req); |
resp_searchform(req); |
puts("<P>\n" |
printf("<P>\n" |
"This web interface is documented in the " |
"This web interface is documented in the " |
"<A HREF=\"search?expr=Nm~^man\\.cgi$&sec=8\">" |
"<A HREF=\"%s/search?expr=Nm~^man\\.cgi$&sec=8\">" |
"man.cgi</A> manual, and the " |
"man.cgi</A> manual, and the " |
"<A HREF=\"search?expr=Nm~^apropos$&sec=1\">" |
"<A HREF=\"%s/search?expr=Nm~^apropos$&sec=1\">" |
"apropos</A> manual explains the query syntax.\n" |
"apropos</A> manual explains the query syntax.\n" |
"</P>"); |
"</P>\n", |
|
scriptname, scriptname); |
resp_end_html(); |
resp_end_html(); |
} |
} |
|
|
Line 484 resp_search(const struct req *req, struct manpage *r, |
|
Line 484 resp_search(const struct req *req, struct manpage *r, |
|
* 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"); |
printf("Status: 303 See Other\r\n"); |
printf("Location: http://%s%s/show/%s/%s?", |
printf("Location: http://%s%s/show/%s/%s?", |
httphost, scriptname, req->q.manpath, r[0].file); |
httphost, scriptname, req->q.manpath, r[0].file); |
http_printquery(req); |
http_printquery(req); |
puts("\n" |
printf("\r\n" |
"Content-Type: text/html; charset=utf-8\n"); |
"Content-Type: text/html; charset=utf-8\r\n" |
|
"\r\n"); |
return; |
return; |
} |
} |
|
|
Line 780 pg_search(const struct req *req, char *path) |
|
Line 781 pg_search(const struct req *req, char *path) |
|
|
|
search.arch = req->q.arch; |
search.arch = req->q.arch; |
search.sec = req->q.sec; |
search.sec = req->q.sec; |
search.deftype = TYPE_Nm | TYPE_Nd; |
search.deftype = req->q.equal ? TYPE_Nm : (TYPE_Nm | TYPE_Nd); |
search.flags = 0; |
search.flags = req->q.equal ? MANSEARCH_MAN : 0; |
|
|
paths.sz = 1; |
paths.sz = 1; |
paths.paths = mandoc_malloc(sizeof(char *)); |
paths.paths = mandoc_malloc(sizeof(char *)); |