version 1.105, 2015/03/27 17:37:25 |
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 |
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 |