version 1.103, 2015/01/15 04:26:39 |
version 1.116, 2016/01/04 12:36:26 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2014 Ingo Schwarze <schwarze@usta.de> |
* Copyright (c) 2014, 2015 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 |
* copyright notice and this permission notice appear in all copies. |
* copyright notice and this permission notice appear in all copies. |
* |
* |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHORS DISCLAIM ALL WARRANTIES |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
|
|
#include <string.h> |
#include <string.h> |
#include <unistd.h> |
#include <unistd.h> |
|
|
#include "mandoc.h" |
|
#include "mandoc_aux.h" |
#include "mandoc_aux.h" |
|
#include "mandoc.h" |
|
#include "roff.h" |
|
#include "mdoc.h" |
|
#include "man.h" |
#include "main.h" |
#include "main.h" |
#include "manpath.h" |
#include "manconf.h" |
#include "mansearch.h" |
#include "mansearch.h" |
#include "cgi.h" |
#include "cgi.h" |
|
|
Line 58 static void catman(const struct req *, const char *) |
|
Line 61 static void catman(const struct req *, const char *) |
|
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_putchar(char); |
static void html_putchar(char); |
static int http_decode(char *); |
static int http_decode(char *); |
static void http_parse(struct req *, const char *); |
static void http_parse(struct req *, const char *); |
static void http_print(const char *); |
|
static void http_putchar(char); |
|
static void http_printquery(const struct req *, const char *); |
|
static void pathgen(struct req *); |
static void pathgen(struct req *); |
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); |
Line 74 static void pg_searchres(const struct req *, |
|
Line 74 static void pg_searchres(const struct req *, |
|
static void pg_show(struct req *, const char *); |
static void pg_show(struct req *, const char *); |
static void resp_begin_html(int, const char *); |
static void resp_begin_html(int, const char *); |
static void resp_begin_http(int, const char *); |
static void resp_begin_http(int, const char *); |
|
static void resp_copy(const char *); |
static void resp_end_html(void); |
static void resp_end_html(void); |
static void resp_searchform(const struct req *); |
static void resp_searchform(const struct req *); |
static void resp_show(const struct req *, const char *); |
static void resp_show(const struct req *, const char *); |
Line 145 html_putchar(char c) |
|
Line 146 html_putchar(char c) |
|
} |
} |
} |
} |
|
|
static void |
|
http_printquery(const struct req *req, const char *sep) |
|
{ |
|
|
|
if (NULL != req->q.query) { |
|
printf("query="); |
|
http_print(req->q.query); |
|
} |
|
if (0 == req->q.equal) |
|
printf("%sapropos=1", sep); |
|
if (NULL != req->q.sec) { |
|
printf("%ssec=", sep); |
|
http_print(req->q.sec); |
|
} |
|
if (NULL != req->q.arch) { |
|
printf("%sarch=", sep); |
|
http_print(req->q.arch); |
|
} |
|
if (strcmp(req->q.manpath, req->p[0])) { |
|
printf("%smanpath=", sep); |
|
http_print(req->q.manpath); |
|
} |
|
} |
|
|
|
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. |
Line 186 http_print(const char *p) |
|
Line 153 http_print(const char *p) |
|
static void |
static void |
html_print(const char *p) |
html_print(const char *p) |
{ |
{ |
|
|
if (NULL == p) |
if (NULL == p) |
return; |
return; |
while ('\0' != *p) |
while ('\0' != *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 331 http_decode(char *p) |
|
Line 284 http_decode(char *p) |
|
for ( ; '\0' != *p; p++, q++) { |
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; |
if ('\0' == (hex[1] = *(p + 2))) |
if ('\0' == (hex[1] = *(p + 2))) |
return(0); |
return 0; |
if (1 != sscanf(hex, "%x", &c)) |
if (1 != sscanf(hex, "%x", &c)) |
return(0); |
return 0; |
if ('\0' == c) |
if ('\0' == c) |
return(0); |
return 0; |
|
|
*q = (char)c; |
*q = (char)c; |
p += 2; |
p += 2; |
Line 346 http_decode(char *p) |
|
Line 299 http_decode(char *p) |
|
} |
} |
|
|
*q = '\0'; |
*q = '\0'; |
return(1); |
return 1; |
} |
} |
|
|
static void |
static void |
Line 365 resp_begin_http(int code, const char *msg) |
|
Line 318 resp_begin_http(int code, const char *msg) |
|
} |
} |
|
|
static void |
static void |
|
resp_copy(const char *filename) |
|
{ |
|
char buf[4096]; |
|
ssize_t sz; |
|
int fd; |
|
|
|
if ((fd = open(filename, O_RDONLY)) != -1) { |
|
fflush(stdout); |
|
while ((sz = read(fd, buf, sizeof(buf))) > 0) |
|
write(STDOUT_FILENO, buf, sz); |
|
} |
|
} |
|
|
|
static void |
resp_begin_html(int code, const char *msg) |
resp_begin_html(int code, const char *msg) |
{ |
{ |
|
|
Line 374 resp_begin_html(int code, const char *msg) |
|
Line 341 resp_begin_html(int code, const char *msg) |
|
"<HTML>\n" |
"<HTML>\n" |
"<HEAD>\n" |
"<HEAD>\n" |
"<META CHARSET=\"UTF-8\" />\n" |
"<META CHARSET=\"UTF-8\" />\n" |
"<LINK REL=\"stylesheet\" HREF=\"%s/man-cgi.css\"" |
"<LINK REL=\"stylesheet\" HREF=\"%s/mandoc.css\"" |
" TYPE=\"text/css\" media=\"all\">\n" |
" TYPE=\"text/css\" media=\"all\">\n" |
"<LINK REL=\"stylesheet\" HREF=\"%s/man.css\"" |
|
" TYPE=\"text/css\" media=\"all\">\n" |
|
"<TITLE>%s</TITLE>\n" |
"<TITLE>%s</TITLE>\n" |
"</HEAD>\n" |
"</HEAD>\n" |
"<BODY>\n" |
"<BODY>\n" |
"<!-- Begin page content. //-->\n", |
"<!-- Begin page content. //-->\n", |
CSS_DIR, CSS_DIR, CUSTOMIZE_TITLE); |
CSS_DIR, CUSTOMIZE_TITLE); |
|
|
|
resp_copy(MAN_DIR "/header.html"); |
} |
} |
|
|
static void |
static void |
resp_end_html(void) |
resp_end_html(void) |
{ |
{ |
|
|
|
resp_copy(MAN_DIR "/footer.html"); |
|
|
puts("</BODY>\n" |
puts("</BODY>\n" |
"</HTML>"); |
"</HTML>"); |
} |
} |
Line 398 resp_searchform(const struct req *req) |
|
Line 367 resp_searchform(const struct req *req) |
|
{ |
{ |
int i; |
int i; |
|
|
puts(CUSTOMIZE_BEGIN); |
|
puts("<!-- Begin search form. //-->"); |
puts("<!-- Begin search form. //-->"); |
printf("<DIV ID=\"mancgi\">\n" |
printf("<DIV ID=\"mancgi\">\n" |
"<FORM ACTION=\"%s\" METHOD=\"get\">\n" |
"<FORM ACTION=\"%s\" METHOD=\"get\">\n" |
Line 498 validate_urifrag(const char *frag) |
|
Line 466 validate_urifrag(const char *frag) |
|
if ( ! (isalnum((unsigned char)*frag) || |
if ( ! (isalnum((unsigned char)*frag) || |
'-' == *frag || '.' == *frag || |
'-' == *frag || '.' == *frag || |
'/' == *frag || '_' == *frag)) |
'/' == *frag || '_' == *frag)) |
return(0); |
return 0; |
frag++; |
frag++; |
} |
} |
return(1); |
return 1; |
} |
} |
|
|
static int |
static int |
Line 510 validate_manpath(const struct req *req, const char* ma |
|
Line 478 validate_manpath(const struct req *req, const char* ma |
|
size_t i; |
size_t i; |
|
|
if ( ! strcmp(manpath, "mandoc")) |
if ( ! strcmp(manpath, "mandoc")) |
return(1); |
return 1; |
|
|
for (i = 0; i < req->psz; i++) |
for (i = 0; i < req->psz; i++) |
if ( ! strcmp(manpath, req->p[i])) |
if ( ! strcmp(manpath, req->p[i])) |
return(1); |
return 1; |
|
|
return(0); |
return 0; |
} |
} |
|
|
static int |
static int |
Line 526 validate_filename(const char *file) |
|
Line 494 validate_filename(const char *file) |
|
if ('.' == file[0] && '/' == file[1]) |
if ('.' == file[0] && '/' == file[1]) |
file += 2; |
file += 2; |
|
|
return ( ! (strstr(file, "../") || strstr(file, "/..") || |
return ! (strstr(file, "../") || strstr(file, "/..") || |
(strncmp(file, "man", 3) && strncmp(file, "cat", 3)))); |
(strncmp(file, "man", 3) && strncmp(file, "cat", 3))); |
} |
} |
|
|
static void |
static void |
Line 604 pg_searchres(const struct req *req, struct manpage *r, |
|
Line 572 pg_searchres(const struct req *req, struct manpage *r, |
|
* without any delay. |
* without any delay. |
*/ |
*/ |
printf("Status: 303 See Other\r\n"); |
printf("Status: 303 See Other\r\n"); |
printf("Location: http://%s%s/%s/%s?", |
printf("Location: http://%s%s/%s/%s", |
HTTP_HOST, scriptname, req->q.manpath, r[0].file); |
HTTP_HOST, scriptname, req->q.manpath, r[0].file); |
http_printquery(req, "&"); |
|
printf("\r\n" |
printf("\r\n" |
"Content-Type: text/html; charset=utf-8\r\n" |
"Content-Type: text/html; charset=utf-8\r\n" |
"\r\n"); |
"\r\n"); |
Line 621 pg_searchres(const struct req *req, struct manpage *r, |
|
Line 588 pg_searchres(const struct req *req, struct manpage *r, |
|
for (i = 0; i < sz; i++) { |
for (i = 0; i < sz; i++) { |
printf("<TR>\n" |
printf("<TR>\n" |
"<TD CLASS=\"title\">\n" |
"<TD CLASS=\"title\">\n" |
"<A HREF=\"%s/%s/%s?", |
"<A HREF=\"%s/%s/%s", |
scriptname, req->q.manpath, r[i].file); |
scriptname, req->q.manpath, r[i].file); |
http_printquery(req, "&"); |
|
printf("\">"); |
printf("\">"); |
html_print(r[i].names); |
html_print(r[i].names); |
printf("</A>\n" |
printf("</A>\n" |
|
|
catman(const struct req *req, const char *file) |
catman(const struct req *req, const char *file) |
{ |
{ |
FILE *f; |
FILE *f; |
size_t len; |
|
int i; |
|
char *p; |
char *p; |
|
size_t sz; |
|
ssize_t len; |
|
int i; |
int italic, bold; |
int italic, bold; |
|
|
if (NULL == (f = fopen(file, "r"))) { |
if ((f = fopen(file, "r")) == NULL) { |
puts("<P>You specified an invalid manual file.</P>"); |
puts("<P>You specified an invalid manual file.</P>"); |
return; |
return; |
} |
} |
Line 698 catman(const struct req *req, const char *file) |
|
Line 665 catman(const struct req *req, const char *file) |
|
puts("<DIV CLASS=\"catman\">\n" |
puts("<DIV CLASS=\"catman\">\n" |
"<PRE>"); |
"<PRE>"); |
|
|
while (NULL != (p = fgetln(f, &len))) { |
p = NULL; |
|
sz = 0; |
|
|
|
while ((len = getline(&p, &sz, f)) != -1) { |
bold = italic = 0; |
bold = italic = 0; |
for (i = 0; i < (int)len - 1; i++) { |
for (i = 0; i < len - 1; i++) { |
/* |
/* |
* This means that the catpage is out of state. |
* This means that the catpage is out of state. |
* Ignore it and keep going (although the |
* Ignore it and keep going (although the |
* catpage is bogus). |
* catpage is bogus). |
Line 725 catman(const struct req *req, const char *file) |
|
Line 695 catman(const struct req *req, const char *file) |
|
italic = bold = 0; |
italic = bold = 0; |
html_putchar(p[i]); |
html_putchar(p[i]); |
continue; |
continue; |
} else if (i + 2 >= (int)len) |
} else if (i + 2 >= len) |
continue; |
continue; |
|
|
/* Italic mode. */ |
/* Italic mode. */ |
Line 742 catman(const struct req *req, const char *file) |
|
Line 712 catman(const struct req *req, const char *file) |
|
continue; |
continue; |
} |
} |
|
|
/* |
/* |
* Handle funny behaviour troff-isms. |
* Handle funny behaviour troff-isms. |
* These grok'd from the original man2html.c. |
* These grok'd from the original man2html.c. |
*/ |
*/ |
Line 780 catman(const struct req *req, const char *file) |
|
Line 750 catman(const struct req *req, const char *file) |
|
} |
} |
|
|
/* Bold mode. */ |
/* Bold mode. */ |
|
|
if (italic) |
if (italic) |
printf("</I>"); |
printf("</I>"); |
if ( ! bold) |
if ( ! bold) |
Line 791 catman(const struct req *req, const char *file) |
|
Line 761 catman(const struct req *req, const char *file) |
|
html_putchar(p[i]); |
html_putchar(p[i]); |
} |
} |
|
|
/* |
/* |
* Clean up the last character. |
* Clean up the last character. |
* We can get to a newline; don't print that. |
* We can get to a newline; don't print that. |
*/ |
*/ |
|
|
if (italic) |
if (italic) |
Line 801 catman(const struct req *req, const char *file) |
|
Line 771 catman(const struct req *req, const char *file) |
|
if (bold) |
if (bold) |
printf("</B>"); |
printf("</B>"); |
|
|
if (i == (int)len - 1 && '\n' != p[i]) |
if (i == len - 1 && p[i] != '\n') |
html_putchar(p[i]); |
html_putchar(p[i]); |
|
|
putchar('\n'); |
putchar('\n'); |
} |
} |
|
free(p); |
|
|
puts("</PRE>\n" |
puts("</PRE>\n" |
"</DIV>"); |
"</DIV>"); |
Line 816 catman(const struct req *req, const char *file) |
|
Line 787 catman(const struct req *req, const char *file) |
|
static void |
static void |
format(const struct req *req, const char *file) |
format(const struct req *req, const char *file) |
{ |
{ |
|
struct manoutput conf; |
struct mparse *mp; |
struct mparse *mp; |
struct mchars *mchars; |
struct roff_man *man; |
struct mdoc *mdoc; |
|
struct man *man; |
|
void *vp; |
void *vp; |
char *opts; |
|
int fd; |
int fd; |
int usepath; |
int usepath; |
|
|
Line 830 format(const struct req *req, const char *file) |
|
Line 799 format(const struct req *req, const char *file) |
|
return; |
return; |
} |
} |
|
|
mchars = mchars_alloc(); |
mchars_alloc(); |
mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, |
mp = mparse_alloc(MPARSE_SO, MANDOCLEVEL_BADARG, NULL, req->q.manpath); |
mchars, req->q.manpath); |
|
mparse_readfd(mp, fd, file); |
mparse_readfd(mp, fd, file); |
close(fd); |
close(fd); |
|
|
|
memset(&conf, 0, sizeof(conf)); |
|
conf.fragment = 1; |
usepath = strcmp(req->q.manpath, req->p[0]); |
usepath = strcmp(req->q.manpath, req->p[0]); |
mandoc_asprintf(&opts, |
mandoc_asprintf(&conf.man, "%s?query=%%N&sec=%%S%s%s%s%s", |
"fragment,man=%s?query=%%N&sec=%%S%s%s%s%s", |
|
scriptname, |
scriptname, |
req->q.arch ? "&arch=" : "", |
req->q.arch ? "&arch=" : "", |
req->q.arch ? req->q.arch : "", |
req->q.arch ? req->q.arch : "", |
usepath ? "&manpath=" : "", |
usepath ? "&manpath=" : "", |
usepath ? req->q.manpath : ""); |
usepath ? req->q.manpath : ""); |
|
|
mparse_result(mp, &mdoc, &man, NULL); |
mparse_result(mp, &man, NULL); |
if (NULL == man && NULL == mdoc) { |
if (man == NULL) { |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
fprintf(stderr, "fatal mandoc error: %s/%s\n", |
req->q.manpath, file); |
req->q.manpath, file); |
pg_error_internal(); |
pg_error_internal(); |
mparse_free(mp); |
mparse_free(mp); |
mchars_free(mchars); |
mchars_free(); |
return; |
return; |
} |
} |
|
|
vp = html_alloc(mchars, opts); |
vp = html_alloc(&conf); |
|
|
if (NULL != mdoc) |
if (man->macroset == MACROSET_MDOC) { |
html_mdoc(vp, mdoc); |
mdoc_validate(man); |
else |
html_mdoc(vp, man); |
|
} else { |
|
man_validate(man); |
html_man(vp, man); |
html_man(vp, man); |
|
} |
|
|
html_free(vp); |
html_free(vp); |
mparse_free(mp); |
mparse_free(mp); |
mchars_free(mchars); |
mchars_free(); |
free(opts); |
free(conf.man); |
} |
} |
|
|
static void |
static void |
Line 891 pg_show(struct req *req, const char *fullpath) |
|
Line 863 pg_show(struct req *req, const char *fullpath) |
|
pg_error_badrequest( |
pg_error_badrequest( |
"You did not specify a page to show."); |
"You did not specify a page to show."); |
return; |
return; |
} |
} |
manpath = mandoc_strndup(fullpath, file - fullpath); |
manpath = mandoc_strndup(fullpath, file - fullpath); |
file++; |
file++; |
|
|
|
|
if (setitimer(ITIMER_VIRTUAL, &itimer, NULL) == -1) { |
if (setitimer(ITIMER_VIRTUAL, &itimer, NULL) == -1) { |
fprintf(stderr, "setitimer: %s\n", strerror(errno)); |
fprintf(stderr, "setitimer: %s\n", strerror(errno)); |
pg_error_internal(); |
pg_error_internal(); |
return(EXIT_FAILURE); |
return EXIT_FAILURE; |
} |
} |
|
|
/* Scan our run-time environment. */ |
/* Scan our run-time environment. */ |
|
|
fprintf(stderr, "unsafe SCRIPT_NAME \"%s\"\n", |
fprintf(stderr, "unsafe SCRIPT_NAME \"%s\"\n", |
scriptname); |
scriptname); |
pg_error_internal(); |
pg_error_internal(); |
return(EXIT_FAILURE); |
return EXIT_FAILURE; |
} |
} |
|
|
/* |
/* |
|
|
fprintf(stderr, "MAN_DIR: %s: %s\n", |
fprintf(stderr, "MAN_DIR: %s: %s\n", |
MAN_DIR, strerror(errno)); |
MAN_DIR, strerror(errno)); |
pg_error_internal(); |
pg_error_internal(); |
return(EXIT_FAILURE); |
return EXIT_FAILURE; |
} |
} |
|
|
memset(&req, 0, sizeof(struct req)); |
memset(&req, 0, sizeof(struct req)); |
pathgen(&req); |
pathgen(&req); |
|
|
else if ( ! validate_manpath(&req, req.q.manpath)) { |
else if ( ! validate_manpath(&req, req.q.manpath)) { |
pg_error_badrequest( |
pg_error_badrequest( |
"You specified an invalid manpath."); |
"You specified an invalid manpath."); |
return(EXIT_FAILURE); |
return EXIT_FAILURE; |
} |
} |
|
|
if ( ! (NULL == req.q.arch || validate_urifrag(req.q.arch))) { |
if ( ! (NULL == req.q.arch || validate_urifrag(req.q.arch))) { |
pg_error_badrequest( |
pg_error_badrequest( |
"You specified an invalid architecture."); |
"You specified an invalid architecture."); |
return(EXIT_FAILURE); |
return EXIT_FAILURE; |
} |
} |
|
|
/* Dispatch to the three different pages. */ |
/* Dispatch to the three different pages. */ |
|
|
for (i = 0; i < (int)req.psz; i++) |
for (i = 0; i < (int)req.psz; i++) |
free(req.p[i]); |
free(req.p[i]); |
free(req.p); |
free(req.p); |
return(EXIT_SUCCESS); |
return EXIT_SUCCESS; |
} |
} |
|
|
/* |
/* |
Line 1114 pathgen(struct req *req) |
|
Line 1086 pathgen(struct req *req) |
|
FILE *fp; |
FILE *fp; |
char *dp; |
char *dp; |
size_t dpsz; |
size_t dpsz; |
|
ssize_t len; |
|
|
if (NULL == (fp = fopen("manpath.conf", "r"))) { |
if (NULL == (fp = fopen("manpath.conf", "r"))) { |
fprintf(stderr, "%s/manpath.conf: %s\n", |
fprintf(stderr, "%s/manpath.conf: %s\n", |
Line 1122 pathgen(struct req *req) |
|
Line 1095 pathgen(struct req *req) |
|
exit(EXIT_FAILURE); |
exit(EXIT_FAILURE); |
} |
} |
|
|
while (NULL != (dp = fgetln(fp, &dpsz))) { |
dp = NULL; |
if ('\n' == dp[dpsz - 1]) |
dpsz = 0; |
dpsz--; |
|
|
while ((len = getline(&dp, &dpsz, fp)) != -1) { |
|
if (dp[len - 1] == '\n') |
|
dp[--len] = '\0'; |
req->p = mandoc_realloc(req->p, |
req->p = mandoc_realloc(req->p, |
(req->psz + 1) * sizeof(char *)); |
(req->psz + 1) * sizeof(char *)); |
dp = mandoc_strndup(dp, dpsz); |
|
if ( ! validate_urifrag(dp)) { |
if ( ! validate_urifrag(dp)) { |
fprintf(stderr, "%s/manpath.conf contains " |
fprintf(stderr, "%s/manpath.conf contains " |
"unsafe path \"%s\"\n", MAN_DIR, dp); |
"unsafe path \"%s\"\n", MAN_DIR, dp); |
Line 1141 pathgen(struct req *req) |
|
Line 1116 pathgen(struct req *req) |
|
exit(EXIT_FAILURE); |
exit(EXIT_FAILURE); |
} |
} |
req->p[req->psz++] = dp; |
req->p[req->psz++] = dp; |
|
dp = NULL; |
|
dpsz = 0; |
} |
} |
|
free(dp); |
|
|
if ( req->p == NULL ) { |
if ( req->p == NULL ) { |
fprintf(stderr, "%s/manpath.conf is empty\n", MAN_DIR); |
fprintf(stderr, "%s/manpath.conf is empty\n", MAN_DIR); |