version 1.37, 2011/12/16 20:05:31 |
version 1.42, 2012/03/24 01:46:25 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* 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 |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
|
|
#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 134 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 229 http_parse(struct req *req, char *p) |
|
Line 229 http_parse(struct req *req, char *p) |
|
|
|
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; |
|
|
Line 267 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 407 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 506 resp_baddb(void) |
|
Line 495 resp_baddb(void) |
|
static void |
static void |
resp_search(struct res *r, size_t sz, void *arg) |
resp_search(struct res *r, size_t sz, void *arg) |
{ |
{ |
int i; |
size_t i, matched; |
const struct req *req; |
const struct req *req; |
|
|
req = (const struct req *)arg; |
req = (const struct req *)arg; |
|
|
if (sz > 0) |
if (sz > 0) |
assert(req->q.manroot >= 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 |
* If we have just one result, then jump there now |
* without any delay. |
* without any delay. |
Line 522 resp_search(struct res *r, size_t sz, void *arg) |
|
Line 518 resp_search(struct res *r, size_t sz, void *arg) |
|
puts("Status: 303 See Other"); |
puts("Status: 303 See Other"); |
printf("Location: http://%s%s/show/%d/%u/%u.html?", |
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[i].volume, r[i].rec); |
http_printquery(req); |
http_printquery(req); |
puts("\n" |
puts("\n" |
"Content-Type: text/html; charset=utf-8\n"); |
"Content-Type: text/html; charset=utf-8\n"); |
return; |
return; |
} |
} |
|
|
qsort(r, sz, sizeof(struct res), cmp); |
|
|
|
resp_begin_html(200, NULL); |
resp_begin_html(200, NULL); |
resp_searchform(req); |
resp_searchform(req); |
|
|
puts("<DIV CLASS=\"results\">"); |
puts("<DIV CLASS=\"results\">"); |
|
|
if (0 == sz) { |
if (0 == matched) { |
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", |
|
progname); |
|
html_printquery(req); |
|
puts("\">apropos</A>?)"); |
|
} |
|
puts("</P>"); |
|
puts("</DIV>"); |
|
resp_end_html(); |
resp_end_html(); |
return; |
return; |
} |
} |
|
|
|
qsort(r, sz, sizeof(struct res), cmp); |
|
|
puts("<TABLE>"); |
puts("<TABLE>"); |
|
|
for (i = 0; i < (int)sz; i++) { |
for (i = 0; i < sz; i++) { |
|
if ( ! r[i].matched) |
|
continue; |
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?", |
Line 843 pg_show(const struct req *req, char *path) |
|
Line 833 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. */ |
|
|
|
|
static void |
static void |
pg_search(const struct req *req, char *path) |
pg_search(const struct req *req, char *path) |
{ |
{ |
size_t tt; |
size_t tt, ressz; |
struct manpaths ps; |
struct manpaths ps; |
int i, sz, rc; |
int i, sz, rc; |
const char *ep, *start; |
const char *ep, *start; |
|
struct res *res; |
char **cp; |
char **cp; |
struct opts opt; |
struct opts opt; |
struct expr *expr; |
struct expr *expr; |
Line 909 pg_search(const struct req *req, char *path) |
|
Line 901 pg_search(const struct req *req, char *path) |
|
rc = -1; |
rc = -1; |
sz = 0; |
sz = 0; |
cp = NULL; |
cp = NULL; |
|
ressz = 0; |
|
res = NULL; |
|
|
/* |
/* |
* Begin by chdir()ing into the root of the manpath. |
* Begin by chdir()ing into the root of the manpath. |
Line 951 pg_search(const struct req *req, char *path) |
|
Line 945 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) |
rc = apropos_search |
rc = apropos_search |
(ps.sz, ps.paths, &opt, |
(ps.sz, ps.paths, &opt, expr, tt, |
expr, tt, (void *)req, resp_search); |
(void *)req, &ressz, &res, resp_search); |
|
|
/* ...unless errors occured. */ |
/* ...unless errors occured. */ |
|
|
if (0 == rc) |
if (0 == rc) |
resp_baddb(); |
resp_baddb(); |
else if (-1 == rc) |
else if (-1 == rc) |
resp_search(NULL, 0, (void *)req); |
resp_search(NULL, 0, NULL); |
|
|
for (i = 0; i < sz; i++) |
for (i = 0; i < sz; i++) |
free(cp[i]); |
free(cp[i]); |
|
|
free(cp); |
free(cp); |
|
resfree(res, ressz); |
exprfree(expr); |
exprfree(expr); |
manpath_free(&ps); |
manpath_free(&ps); |
} |
} |