version 1.334, 2019/07/26 21:03:19 |
version 1.336, 2019/07/27 13:40:57 |
|
|
OUTT_PDF /* -Tpdf */ |
OUTT_PDF /* -Tpdf */ |
}; |
}; |
|
|
struct curparse { |
struct outstate { |
struct manoutput *outopts; /* output options */ |
struct tag_files *tag_files; /* Tagging state variables. */ |
void *outdata; /* data for output */ |
void *outdata; /* data for output */ |
|
int use_pager; |
int wstop; /* stop after a file with a warning */ |
int wstop; /* stop after a file with a warning */ |
enum outt outtype; /* which output to use */ |
enum outt outtype; /* which output to use */ |
}; |
}; |
Line 95 static int fs_lookup(const struct manpaths *, |
|
Line 96 static int fs_lookup(const struct manpaths *, |
|
static int fs_search(const struct mansearch *, |
static int fs_search(const struct mansearch *, |
const struct manpaths *, int, char**, |
const struct manpaths *, int, char**, |
struct manpage **, size_t *); |
struct manpage **, size_t *); |
static void outdata_alloc(struct curparse *); |
static void outdata_alloc(struct outstate *, struct manoutput *); |
static void parse(struct mparse *, int, const char *, |
static void parse(struct mparse *, int, const char *, |
struct curparse *); |
struct outstate *, struct manoutput *); |
static void passthrough(int, int); |
static void passthrough(int, int); |
static void run_pager(struct tag_files *); |
static void run_pager(struct tag_files *); |
static pid_t spawn_pager(struct tag_files *); |
static pid_t spawn_pager(struct tag_files *); |
|
|
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
{ |
{ |
struct manconf conf; /* Manpaths and output options. */ |
struct manconf conf; /* Manpaths and output options. */ |
struct curparse curp; |
struct outstate outst; /* Output state. */ |
struct winsize ws; /* Result of ioctl(TIOCGWINSZ). */ |
struct winsize ws; /* Result of ioctl(TIOCGWINSZ). */ |
struct mansearch search; /* Search options. */ |
struct mansearch search; /* Search options. */ |
struct manpage *res, *resp; /* Search results. */ |
struct manpage *res, *resp; /* Search results. */ |
struct mparse *mp; /* Opaque parser object. */ |
struct mparse *mp; /* Opaque parser object. */ |
struct tag_files *tag_files; /* Tagging state variables. */ |
|
const char *conf_file; /* -C: alternate config file. */ |
const char *conf_file; /* -C: alternate config file. */ |
const char *os_s; /* -I: Operating system for display. */ |
const char *os_s; /* -I: Operating system for display. */ |
const char *progname, *sec, *thisarg; |
const char *progname, *sec, *thisarg; |
Line 131 main(int argc, char *argv[]) |
|
Line 131 main(int argc, char *argv[]) |
|
size_t i, ssz; |
size_t i, ssz; |
int options; /* Parser options. */ |
int options; /* Parser options. */ |
int show_usage; /* Invalid argument: give up. */ |
int show_usage; /* Invalid argument: give up. */ |
int use_pager; /* According to command line. */ |
|
int prio, best_prio; |
int prio, best_prio; |
int fd, startdir; |
int fd, startdir; |
int c; |
int c; |
Line 187 main(int argc, char *argv[]) |
|
Line 186 main(int argc, char *argv[]) |
|
else |
else |
search.argmode = ARG_FILE; |
search.argmode = ARG_FILE; |
|
|
/* Parser and formatter options. */ |
/* Parser options. */ |
|
|
|
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
os_e = MANDOC_OS_OTHER; |
os_e = MANDOC_OS_OTHER; |
os_s = NULL; |
os_s = NULL; |
memset(&curp, 0, sizeof(struct curparse)); |
|
curp.outtype = OUTT_LOCALE; |
|
curp.outopts = &conf.output; |
|
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
|
|
|
use_pager = 1; |
/* Formatter options. */ |
tag_files = NULL; |
|
|
memset(&outst, 0, sizeof(outst)); |
|
outst.tag_files = NULL; |
|
outst.outtype = OUTT_LOCALE; |
|
outst.use_pager = 1; |
|
|
show_usage = 0; |
show_usage = 0; |
outmode = OUTMODE_DEF; |
outmode = OUTMODE_DEF; |
|
|
Line 215 main(int argc, char *argv[]) |
|
Line 216 main(int argc, char *argv[]) |
|
conf_file = optarg; |
conf_file = optarg; |
break; |
break; |
case 'c': |
case 'c': |
use_pager = 0; |
outst.use_pager = 0; |
break; |
break; |
case 'f': |
case 'f': |
search.argmode = ARG_WORD; |
search.argmode = ARG_WORD; |
break; |
break; |
case 'h': |
case 'h': |
conf.output.synopsisonly = 1; |
conf.output.synopsisonly = 1; |
use_pager = 0; |
outst.use_pager = 0; |
outmode = OUTMODE_ALL; |
outmode = OUTMODE_ALL; |
break; |
break; |
case 'I': |
case 'I': |
Line 274 main(int argc, char *argv[]) |
|
Line 275 main(int argc, char *argv[]) |
|
break; |
break; |
case 'T': |
case 'T': |
if (strcmp(optarg, "ascii") == 0) |
if (strcmp(optarg, "ascii") == 0) |
curp.outtype = OUTT_ASCII; |
outst.outtype = OUTT_ASCII; |
else if (strcmp(optarg, "lint") == 0) { |
else if (strcmp(optarg, "lint") == 0) { |
curp.outtype = OUTT_LINT; |
outst.outtype = OUTT_LINT; |
mandoc_msg_setoutfile(stdout); |
mandoc_msg_setoutfile(stdout); |
mandoc_msg_setmin(MANDOCERR_BASE); |
mandoc_msg_setmin(MANDOCERR_BASE); |
} else if (strcmp(optarg, "tree") == 0) |
} else if (strcmp(optarg, "tree") == 0) |
curp.outtype = OUTT_TREE; |
outst.outtype = OUTT_TREE; |
else if (strcmp(optarg, "man") == 0) |
else if (strcmp(optarg, "man") == 0) |
curp.outtype = OUTT_MAN; |
outst.outtype = OUTT_MAN; |
else if (strcmp(optarg, "html") == 0) |
else if (strcmp(optarg, "html") == 0) |
curp.outtype = OUTT_HTML; |
outst.outtype = OUTT_HTML; |
else if (strcmp(optarg, "markdown") == 0) |
else if (strcmp(optarg, "markdown") == 0) |
curp.outtype = OUTT_MARKDOWN; |
outst.outtype = OUTT_MARKDOWN; |
else if (strcmp(optarg, "utf8") == 0) |
else if (strcmp(optarg, "utf8") == 0) |
curp.outtype = OUTT_UTF8; |
outst.outtype = OUTT_UTF8; |
else if (strcmp(optarg, "locale") == 0) |
else if (strcmp(optarg, "locale") == 0) |
curp.outtype = OUTT_LOCALE; |
outst.outtype = OUTT_LOCALE; |
else if (strcmp(optarg, "ps") == 0) |
else if (strcmp(optarg, "ps") == 0) |
curp.outtype = OUTT_PS; |
outst.outtype = OUTT_PS; |
else if (strcmp(optarg, "pdf") == 0) |
else if (strcmp(optarg, "pdf") == 0) |
curp.outtype = OUTT_PDF; |
outst.outtype = OUTT_PDF; |
else { |
else { |
mandoc_msg(MANDOCERR_BADARG_BAD, 0, 0, |
mandoc_msg(MANDOCERR_BADARG_BAD, 0, 0, |
"-T %s", optarg); |
"-T %s", optarg); |
Line 302 main(int argc, char *argv[]) |
|
Line 303 main(int argc, char *argv[]) |
|
} |
} |
break; |
break; |
case 'W': |
case 'W': |
if (woptions(optarg, &os_e, &curp.wstop) == -1) |
if (woptions(optarg, &os_e, &outst.wstop) == -1) |
return mandoc_msg_getrc(); |
return mandoc_msg_getrc(); |
break; |
break; |
case 'w': |
case 'w': |
Line 323 main(int argc, char *argv[]) |
|
Line 324 main(int argc, char *argv[]) |
|
switch (search.argmode) { |
switch (search.argmode) { |
case ARG_FILE: |
case ARG_FILE: |
outmode = OUTMODE_ALL; |
outmode = OUTMODE_ALL; |
use_pager = 0; |
outst.use_pager = 0; |
break; |
break; |
case ARG_NAME: |
case ARG_NAME: |
outmode = OUTMODE_ONE; |
outmode = OUTMODE_ONE; |
Line 346 main(int argc, char *argv[]) |
|
Line 347 main(int argc, char *argv[]) |
|
} |
} |
} |
} |
|
|
if (curp.outtype != OUTT_TREE || !curp.outopts->noval) |
if (outst.outtype != OUTT_TREE || conf.output.noval == 0) |
options |= MPARSE_VALIDATE; |
options |= MPARSE_VALIDATE; |
|
|
if (outmode == OUTMODE_FLN || |
if (outmode == OUTMODE_FLN || |
outmode == OUTMODE_LST || |
outmode == OUTMODE_LST || |
!isatty(STDOUT_FILENO)) |
!isatty(STDOUT_FILENO)) |
use_pager = 0; |
outst.use_pager = 0; |
|
|
if (use_pager && |
if (outst.use_pager && |
(conf.output.width == 0 || conf.output.indent == 0) && |
(conf.output.width == 0 || conf.output.indent == 0) && |
ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && |
ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) != -1 && |
ws.ws_col > 1) { |
ws.ws_col > 1) { |
Line 365 main(int argc, char *argv[]) |
|
Line 366 main(int argc, char *argv[]) |
|
} |
} |
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (use_pager == 0) { |
if (outst.use_pager == 0) { |
if (pledge("stdio rpath", NULL) == -1) { |
if (pledge("stdio rpath", NULL) == -1) { |
mandoc_msg(MANDOCERR_PLEDGE, 0, 0, |
mandoc_msg(MANDOCERR_PLEDGE, 0, 0, |
"%s", strerror(errno)); |
"%s", strerror(errno)); |
Line 532 main(int argc, char *argv[]) |
|
Line 533 main(int argc, char *argv[]) |
|
/* mandoc(1) */ |
/* mandoc(1) */ |
|
|
#if HAVE_PLEDGE |
#if HAVE_PLEDGE |
if (use_pager) { |
if (outst.use_pager) { |
if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1) { |
if (pledge("stdio rpath tmppath tty proc exec", NULL) == -1) { |
mandoc_msg(MANDOCERR_PLEDGE, 0, 0, |
mandoc_msg(MANDOCERR_PLEDGE, 0, 0, |
"%s", strerror(errno)); |
"%s", strerror(errno)); |
Line 558 main(int argc, char *argv[]) |
|
Line 559 main(int argc, char *argv[]) |
|
mp = mparse_alloc(options, os_e, os_s); |
mp = mparse_alloc(options, os_e, os_s); |
|
|
if (argc < 1) { |
if (argc < 1) { |
if (use_pager) { |
if (outst.use_pager) |
tag_files = tag_init(); |
outst.tag_files = tag_init(conf.output.tag); |
if (tag_files != NULL) |
|
tag_files->tagname = conf.output.tag; |
|
} |
|
thisarg = "<stdin>"; |
thisarg = "<stdin>"; |
mandoc_msg_setinfilename(thisarg); |
mandoc_msg_setinfilename(thisarg); |
parse(mp, STDIN_FILENO, thisarg, &curp); |
parse(mp, STDIN_FILENO, thisarg, &outst, &conf.output); |
mandoc_msg_setinfilename(NULL); |
mandoc_msg_setinfilename(NULL); |
} |
} |
|
|
Line 597 main(int argc, char *argv[]) |
|
Line 595 main(int argc, char *argv[]) |
|
mandoc_msg_setinfilename(thisarg); |
mandoc_msg_setinfilename(thisarg); |
fd = mparse_open(mp, thisarg); |
fd = mparse_open(mp, thisarg); |
if (fd != -1) { |
if (fd != -1) { |
if (use_pager) { |
if (outst.use_pager) { |
use_pager = 0; |
outst.use_pager = 0; |
tag_files = tag_init(); |
outst.tag_files = tag_init(conf.output.tag); |
if (tag_files != NULL) |
|
tag_files->tagname = conf.output.tag; |
|
} |
} |
|
|
if (resp == NULL || resp->form == FORM_SRC) |
if (resp == NULL || resp->form == FORM_SRC) |
parse(mp, fd, thisarg, &curp); |
parse(mp, fd, thisarg, &outst, &conf.output); |
else |
else |
passthrough(fd, conf.output.synopsisonly); |
passthrough(fd, conf.output.synopsisonly); |
|
|
if (ferror(stdout)) { |
if (ferror(stdout)) { |
if (tag_files != NULL) { |
if (outst.tag_files != NULL) { |
mandoc_msg(MANDOCERR_WRITE, 0, 0, |
mandoc_msg(MANDOCERR_WRITE, 0, 0, |
"%s: %s", tag_files->ofn, |
"%s: %s", outst.tag_files->ofn, |
strerror(errno)); |
strerror(errno)); |
tag_unlink(); |
tag_unlink(); |
tag_files = NULL; |
outst.tag_files = NULL; |
} else |
} else |
mandoc_msg(MANDOCERR_WRITE, 0, 0, |
mandoc_msg(MANDOCERR_WRITE, 0, 0, |
"%s", strerror(errno)); |
"%s", strerror(errno)); |
break; |
break; |
} |
} |
|
|
if (argc > 1 && curp.outtype <= OUTT_UTF8) { |
if (argc > 1 && outst.outtype <= OUTT_UTF8) { |
if (curp.outdata == NULL) |
if (outst.outdata == NULL) |
outdata_alloc(&curp); |
outdata_alloc(&outst, &conf.output); |
terminal_sepline(curp.outdata); |
terminal_sepline(outst.outdata); |
} |
} |
} else |
} else |
mandoc_msg(resp == NULL ? MANDOCERR_BADARG_BAD : |
mandoc_msg(resp == NULL ? MANDOCERR_BADARG_BAD : |
Line 633 main(int argc, char *argv[]) |
|
Line 629 main(int argc, char *argv[]) |
|
|
|
mandoc_msg_setinfilename(NULL); |
mandoc_msg_setinfilename(NULL); |
|
|
if (curp.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK) |
if (outst.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK) |
break; |
break; |
|
|
if (resp != NULL) |
if (resp != NULL) |
Line 648 main(int argc, char *argv[]) |
|
Line 644 main(int argc, char *argv[]) |
|
close(startdir); |
close(startdir); |
} |
} |
|
|
if (curp.outdata != NULL) { |
if (outst.outdata != NULL) { |
switch (curp.outtype) { |
switch (outst.outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
html_free(curp.outdata); |
html_free(outst.outdata); |
break; |
break; |
case OUTT_UTF8: |
case OUTT_UTF8: |
case OUTT_LOCALE: |
case OUTT_LOCALE: |
case OUTT_ASCII: |
case OUTT_ASCII: |
ascii_free(curp.outdata); |
ascii_free(outst.outdata); |
break; |
break; |
case OUTT_PDF: |
case OUTT_PDF: |
case OUTT_PS: |
case OUTT_PS: |
pspdf_free(curp.outdata); |
pspdf_free(outst.outdata); |
break; |
break; |
default: |
default: |
break; |
break; |
|
|
mansearch_free(res, sz); |
mansearch_free(res, sz); |
} |
} |
|
|
if (tag_files != NULL) { |
if (outst.tag_files != NULL) { |
fclose(stdout); |
fclose(stdout); |
tag_write(); |
tag_write(); |
run_pager(tag_files); |
run_pager(outst.tag_files); |
tag_unlink(); |
tag_unlink(); |
} else if (curp.outtype != OUTT_LINT && |
} else if (outst.outtype != OUTT_LINT && |
(search.argmode == ARG_FILE || sz > 0)) |
(search.argmode == ARG_FILE || sz > 0)) |
mandoc_msg_summary(); |
mandoc_msg_summary(); |
|
|
Line 842 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 838 fs_search(const struct mansearch *cfg, const struct ma |
|
} |
} |
|
|
static void |
static void |
parse(struct mparse *mp, int fd, const char *file, struct curparse *curp) |
parse(struct mparse *mp, int fd, const char *file, |
|
struct outstate *outst, struct manoutput *outconf) |
{ |
{ |
struct roff_meta *meta; |
struct roff_meta *meta; |
|
|
Line 860 parse(struct mparse *mp, int fd, const char *file, str |
|
Line 857 parse(struct mparse *mp, int fd, const char *file, str |
|
* level, do not produce output. |
* level, do not produce output. |
*/ |
*/ |
|
|
if (curp->wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK) |
if (outst->wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK) |
return; |
return; |
|
|
if (curp->outdata == NULL) |
if (outst->outdata == NULL) |
outdata_alloc(curp); |
outdata_alloc(outst, outconf); |
else if (curp->outtype == OUTT_HTML) |
else if (outst->outtype == OUTT_HTML) |
html_reset(curp); |
html_reset(outst); |
|
|
mandoc_xr_reset(); |
mandoc_xr_reset(); |
meta = mparse_result(mp); |
meta = mparse_result(mp); |
Line 874 parse(struct mparse *mp, int fd, const char *file, str |
|
Line 871 parse(struct mparse *mp, int fd, const char *file, str |
|
/* Execute the out device, if it exists. */ |
/* Execute the out device, if it exists. */ |
|
|
if (meta->macroset == MACROSET_MDOC) { |
if (meta->macroset == MACROSET_MDOC) { |
switch (curp->outtype) { |
switch (outst->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
html_mdoc(curp->outdata, meta); |
html_mdoc(outst->outdata, meta); |
break; |
break; |
case OUTT_TREE: |
case OUTT_TREE: |
tree_mdoc(curp->outdata, meta); |
tree_mdoc(outst->outdata, meta); |
break; |
break; |
case OUTT_MAN: |
case OUTT_MAN: |
man_mdoc(curp->outdata, meta); |
man_mdoc(outst->outdata, meta); |
break; |
break; |
case OUTT_PDF: |
case OUTT_PDF: |
case OUTT_ASCII: |
case OUTT_ASCII: |
case OUTT_UTF8: |
case OUTT_UTF8: |
case OUTT_LOCALE: |
case OUTT_LOCALE: |
case OUTT_PS: |
case OUTT_PS: |
terminal_mdoc(curp->outdata, meta); |
terminal_mdoc(outst->outdata, meta); |
break; |
break; |
case OUTT_MARKDOWN: |
case OUTT_MARKDOWN: |
markdown_mdoc(curp->outdata, meta); |
markdown_mdoc(outst->outdata, meta); |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
if (meta->macroset == MACROSET_MAN) { |
if (meta->macroset == MACROSET_MAN) { |
switch (curp->outtype) { |
switch (outst->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
html_man(curp->outdata, meta); |
html_man(outst->outdata, meta); |
break; |
break; |
case OUTT_TREE: |
case OUTT_TREE: |
tree_man(curp->outdata, meta); |
tree_man(outst->outdata, meta); |
break; |
break; |
case OUTT_MAN: |
case OUTT_MAN: |
mparse_copy(mp); |
mparse_copy(mp); |
Line 914 parse(struct mparse *mp, int fd, const char *file, str |
|
Line 911 parse(struct mparse *mp, int fd, const char *file, str |
|
case OUTT_UTF8: |
case OUTT_UTF8: |
case OUTT_LOCALE: |
case OUTT_LOCALE: |
case OUTT_PS: |
case OUTT_PS: |
terminal_man(curp->outdata, meta); |
terminal_man(outst->outdata, meta); |
break; |
break; |
default: |
default: |
break; |
break; |
|
|
} |
} |
|
|
static void |
static void |
outdata_alloc(struct curparse *curp) |
outdata_alloc(struct outstate *outst, struct manoutput *outconf) |
{ |
{ |
switch (curp->outtype) { |
switch (outst->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
curp->outdata = html_alloc(curp->outopts); |
outst->outdata = html_alloc(outconf); |
break; |
break; |
case OUTT_UTF8: |
case OUTT_UTF8: |
curp->outdata = utf8_alloc(curp->outopts); |
outst->outdata = utf8_alloc(outconf); |
break; |
break; |
case OUTT_LOCALE: |
case OUTT_LOCALE: |
curp->outdata = locale_alloc(curp->outopts); |
outst->outdata = locale_alloc(outconf); |
break; |
break; |
case OUTT_ASCII: |
case OUTT_ASCII: |
curp->outdata = ascii_alloc(curp->outopts); |
outst->outdata = ascii_alloc(outconf); |
break; |
break; |
case OUTT_PDF: |
case OUTT_PDF: |
curp->outdata = pdf_alloc(curp->outopts); |
outst->outdata = pdf_alloc(outconf); |
break; |
break; |
case OUTT_PS: |
case OUTT_PS: |
curp->outdata = ps_alloc(curp->outopts); |
outst->outdata = ps_alloc(outconf); |
break; |
break; |
default: |
default: |
break; |
break; |