version 1.163, 2018/12/14 01:18:25 |
version 1.168, 2019/10/01 17:54:14 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2014, 2015, 2016, 2017, 2018 Ingo Schwarze <schwarze@usta.de> |
* Copyright (c) 2014-2019 Ingo Schwarze <schwarze@usta.de> |
* |
* |
* 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 |
Line 77 static void parse_query_string(struct req *, const c |
|
Line 77 static void parse_query_string(struct req *, const c |
|
static void pg_error_badrequest(const char *); |
static void pg_error_badrequest(const char *); |
static void pg_error_internal(void); |
static void pg_error_internal(void); |
static void pg_index(const struct req *); |
static void pg_index(const struct req *); |
static void pg_noresult(const struct req *, const char *); |
static void pg_noresult(const struct req *, int, const char *, |
|
const char *); |
static void pg_redirect(const struct req *, const char *); |
static void pg_redirect(const struct req *, const char *); |
static void pg_search(const struct req *); |
static void pg_search(const struct req *); |
static void pg_searchres(const struct req *, |
static void pg_searchres(const struct req *, |
Line 324 http_encode(const char *p) |
|
Line 325 http_encode(const char *p) |
|
for (; *p != '\0'; p++) { |
for (; *p != '\0'; p++) { |
if (isalnum((unsigned char)*p) == 0 && |
if (isalnum((unsigned char)*p) == 0 && |
strchr("-._~", *p) == NULL) |
strchr("-._~", *p) == NULL) |
printf("%%%02.2X", (unsigned char)*p); |
printf("%%%2.2X", (unsigned char)*p); |
else |
else |
putchar(*p); |
putchar(*p); |
} |
} |
Line 546 pg_index(const struct req *req) |
|
Line 547 pg_index(const struct req *req) |
|
} |
} |
|
|
static void |
static void |
pg_noresult(const struct req *req, const char *msg) |
pg_noresult(const struct req *req, int code, const char *http_msg, |
|
const char *user_msg) |
{ |
{ |
resp_begin_html(200, NULL, NULL); |
resp_begin_html(code, http_msg, NULL); |
resp_searchform(req, FOCUS_QUERY); |
resp_searchform(req, FOCUS_QUERY); |
puts("<p>"); |
puts("<p>"); |
puts(msg); |
puts(user_msg); |
puts("</p>"); |
puts("</p>"); |
resp_end_html(); |
resp_end_html(); |
} |
} |
Line 849 resp_format(const struct req *req, const char *file) |
|
Line 851 resp_format(const struct req *req, const char *file) |
|
{ |
{ |
struct manoutput conf; |
struct manoutput conf; |
struct mparse *mp; |
struct mparse *mp; |
struct roff_man *man; |
struct roff_meta *meta; |
void *vp; |
void *vp; |
int fd; |
int fd; |
int usepath; |
int usepath; |
Line 860 resp_format(const struct req *req, const char *file) |
|
Line 862 resp_format(const struct req *req, const char *file) |
|
} |
} |
|
|
mchars_alloc(); |
mchars_alloc(); |
mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1, |
mp = mparse_alloc(MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1 | |
MANDOC_OS_OTHER, req->q.manpath); |
MPARSE_VALIDATE, MANDOC_OS_OTHER, req->q.manpath); |
mparse_readfd(mp, fd, file); |
mparse_readfd(mp, fd, file); |
close(fd); |
close(fd); |
|
meta = mparse_result(mp); |
|
|
memset(&conf, 0, sizeof(conf)); |
memset(&conf, 0, sizeof(conf)); |
conf.fragment = 1; |
conf.fragment = 1; |
conf.style = mandoc_strdup(CSS_DIR "/mandoc.css"); |
conf.style = mandoc_strdup(CSS_DIR "/mandoc.css"); |
conf.toc = 1; |
|
usepath = strcmp(req->q.manpath, req->p[0]); |
usepath = strcmp(req->q.manpath, req->p[0]); |
mandoc_asprintf(&conf.man, "/%s%s%s%s%%N.%%S", |
mandoc_asprintf(&conf.man, "/%s%s%s%s%%N.%%S", |
scriptname, *scriptname == '\0' ? "" : "/", |
scriptname, *scriptname == '\0' ? "" : "/", |
usepath ? req->q.manpath : "", usepath ? "/" : ""); |
usepath ? req->q.manpath : "", usepath ? "/" : ""); |
|
|
mparse_result(mp, &man, NULL); |
|
if (man == NULL) { |
|
warnx("fatal mandoc error: %s/%s", req->q.manpath, file); |
|
pg_error_internal(); |
|
mparse_free(mp); |
|
mchars_free(); |
|
return; |
|
} |
|
|
|
vp = html_alloc(&conf); |
vp = html_alloc(&conf); |
|
if (meta->macroset == MACROSET_MDOC) |
|
html_mdoc(vp, meta); |
|
else |
|
html_man(vp, meta); |
|
|
if (man->macroset == MACROSET_MDOC) { |
|
mdoc_validate(man); |
|
html_mdoc(vp, man); |
|
} else { |
|
man_validate(man); |
|
html_man(vp, man); |
|
} |
|
|
|
html_free(vp); |
html_free(vp); |
mparse_free(mp); |
mparse_free(mp); |
mchars_free(); |
mchars_free(); |
Line 1029 pg_search(const struct req *req) |
|
Line 1018 pg_search(const struct req *req) |
|
if (req->isquery && req->q.equal && argc == 1) |
if (req->isquery && req->q.equal && argc == 1) |
pg_redirect(req, argv[0]); |
pg_redirect(req, argv[0]); |
else if (mansearch(&search, &paths, argc, argv, &res, &ressz) == 0) |
else if (mansearch(&search, &paths, argc, argv, &res, &ressz) == 0) |
pg_noresult(req, "You entered an invalid query."); |
pg_noresult(req, 400, "Bad Request", |
|
"You entered an invalid query."); |
else if (ressz == 0) |
else if (ressz == 0) |
pg_noresult(req, "No results found."); |
pg_noresult(req, 404, "Not Found", "No results found."); |
else |
else |
pg_searchres(req, res, ressz); |
pg_searchres(req, res, ressz); |
|
|
Line 1190 parse_path_info(struct req *req, const char *path) |
|
Line 1180 parse_path_info(struct req *req, const char *path) |
|
} |
} |
|
|
/* Optional section. */ |
/* Optional section. */ |
if (strncmp(path, "man", 3) == 0) { |
if (strncmp(path, "man", 3) == 0 || strncmp(path, "cat", 3) == 0) { |
path += 3; |
path += 3; |
end = strchr(path, '/'); |
end = strchr(path, '/'); |
free(req->q.sec); |
free(req->q.sec); |