version 1.104, 2015/02/10 08:05:30 |
version 1.107, 2015/04/18 16:06:39 |
|
|
/* $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 "mandoc.h" |
#include "mandoc.h" |
#include "mandoc_aux.h" |
#include "mandoc_aux.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 816 catman(const struct req *req, const char *file) |
|
Line 816 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 mchars *mchars; |
struct mdoc *mdoc; |
struct roff_man *mdoc; |
struct man *man; |
struct roff_man *man; |
void *vp; |
void *vp; |
char *opts; |
|
int fd; |
int fd; |
int usepath; |
int usepath; |
|
|
Line 836 format(const struct req *req, const char *file) |
|
Line 836 format(const struct req *req, const char *file) |
|
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 : "", |
Line 855 format(const struct req *req, const char *file) |
|
Line 856 format(const struct req *req, const char *file) |
|
return; |
return; |
} |
} |
|
|
vp = html_alloc(mchars, opts); |
vp = html_alloc(mchars, &conf); |
|
|
if (NULL != mdoc) |
if (NULL != mdoc) |
html_mdoc(vp, mdoc); |
html_mdoc(vp, mdoc); |
Line 865 format(const struct req *req, const char *file) |
|
Line 866 format(const struct req *req, const char *file) |
|
html_free(vp); |
html_free(vp); |
mparse_free(mp); |
mparse_free(mp); |
mchars_free(mchars); |
mchars_free(mchars); |
free(opts); |
free(conf.man); |
} |
} |
|
|
static void |
static void |