version 1.314, 2018/12/20 21:30:32 |
version 1.316, 2019/01/01 08:18:11 |
Line 123 main(int argc, char *argv[]) |
|
Line 123 main(int argc, char *argv[]) |
|
struct manpage *res, *resp; |
struct manpage *res, *resp; |
const char *progname, *sec, *thisarg; |
const char *progname, *sec, *thisarg; |
char *conf_file, *defpaths, *auxpaths; |
char *conf_file, *defpaths, *auxpaths; |
char *oarg; |
char *oarg, *tagarg; |
unsigned char *uc; |
unsigned char *uc; |
size_t i, sz; |
size_t i, sz; |
int prio, best_prio; |
int prio, best_prio; |
Line 308 main(int argc, char *argv[]) |
|
Line 308 main(int argc, char *argv[]) |
|
} |
} |
} |
} |
|
|
|
if (curp.outtype != OUTT_TREE || !curp.outopts->noval) |
|
options |= MPARSE_VALIDATE; |
|
|
if (outmode == OUTMODE_FLN || |
if (outmode == OUTMODE_FLN || |
outmode == OUTMODE_LST || |
outmode == OUTMODE_LST || |
!isatty(STDOUT_FILENO)) |
!isatty(STDOUT_FILENO)) |
Line 365 main(int argc, char *argv[]) |
|
Line 368 main(int argc, char *argv[]) |
|
#endif |
#endif |
} |
} |
|
|
|
/* |
|
* Use the first argument for -O tag in addition to |
|
* using it as a search term for man(1) or apropos(1). |
|
*/ |
|
|
|
if (conf.output.tag != NULL && *conf.output.tag == '\0') { |
|
tagarg = argc > 0 && search.argmode == ARG_EXPR ? |
|
strchr(*argv, '=') : NULL; |
|
conf.output.tag = tagarg == NULL ? *argv : tagarg + 1; |
|
} |
|
|
/* man(1), whatis(1), apropos(1) */ |
/* man(1), whatis(1), apropos(1) */ |
|
|
if (search.argmode != ARG_FILE) { |
if (search.argmode != ARG_FILE) { |
Line 477 main(int argc, char *argv[]) |
|
Line 491 main(int argc, char *argv[]) |
|
curp.mp = mparse_alloc(options, curp.os_e, curp.os_s); |
curp.mp = mparse_alloc(options, curp.os_e, curp.os_s); |
|
|
if (argc < 1) { |
if (argc < 1) { |
if (use_pager) |
if (use_pager) { |
tag_files = tag_init(); |
tag_files = tag_init(); |
|
tag_files->tagname = conf.output.tag; |
|
} |
thisarg = "<stdin>"; |
thisarg = "<stdin>"; |
mandoc_msg_setinfilename(thisarg); |
mandoc_msg_setinfilename(thisarg); |
parse(&curp, STDIN_FILENO, thisarg); |
parse(&curp, STDIN_FILENO, thisarg); |
Line 515 main(int argc, char *argv[]) |
|
Line 531 main(int argc, char *argv[]) |
|
if (use_pager) { |
if (use_pager) { |
use_pager = 0; |
use_pager = 0; |
tag_files = tag_init(); |
tag_files = tag_init(); |
if (conf.output.tag != NULL && |
tag_files->tagname = conf.output.tag; |
tag_files->tagname == NULL) |
|
tag_files->tagname = |
|
*conf.output.tag != '\0' ? |
|
conf.output.tag : *argv; |
|
} |
} |
|
|
mandoc_msg_setinfilename(thisarg); |
mandoc_msg_setinfilename(thisarg); |
Line 801 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 813 fs_search(const struct mansearch *cfg, const struct ma |
|
static void |
static void |
parse(struct curparse *curp, int fd, const char *file) |
parse(struct curparse *curp, int fd, const char *file) |
{ |
{ |
struct roff_man *man; |
struct roff_meta *meta; |
|
|
/* Begin by parsing the file itself. */ |
/* Begin by parsing the file itself. */ |
|
|
Line 823 parse(struct curparse *curp, int fd, const char *file) |
|
Line 835 parse(struct curparse *curp, int fd, const char *file) |
|
if (curp->outdata == NULL) |
if (curp->outdata == NULL) |
outdata_alloc(curp); |
outdata_alloc(curp); |
|
|
mparse_result(curp->mp, &man, NULL); |
mandoc_xr_reset(); |
|
meta = mparse_result(curp->mp); |
|
|
/* Execute the out device, if it exists. */ |
/* Execute the out device, if it exists. */ |
|
|
if (man == NULL) |
if (meta->macroset == MACROSET_MDOC) { |
return; |
|
mandoc_xr_reset(); |
|
if (man->macroset == MACROSET_MDOC) { |
|
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
|
mdoc_validate(man); |
|
switch (curp->outtype) { |
switch (curp->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
html_mdoc(curp->outdata, man); |
html_mdoc(curp->outdata, meta); |
break; |
break; |
case OUTT_TREE: |
case OUTT_TREE: |
tree_mdoc(curp->outdata, man); |
tree_mdoc(curp->outdata, meta); |
break; |
break; |
case OUTT_MAN: |
case OUTT_MAN: |
man_mdoc(curp->outdata, man); |
man_mdoc(curp->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, man); |
terminal_mdoc(curp->outdata, meta); |
break; |
break; |
case OUTT_MARKDOWN: |
case OUTT_MARKDOWN: |
markdown_mdoc(curp->outdata, man); |
markdown_mdoc(curp->outdata, meta); |
break; |
break; |
default: |
default: |
break; |
break; |
} |
} |
} |
} |
if (man->macroset == MACROSET_MAN) { |
if (meta->macroset == MACROSET_MAN) { |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
|
man_validate(man); |
|
switch (curp->outtype) { |
switch (curp->outtype) { |
case OUTT_HTML: |
case OUTT_HTML: |
html_man(curp->outdata, man); |
html_man(curp->outdata, meta); |
break; |
break; |
case OUTT_TREE: |
case OUTT_TREE: |
tree_man(curp->outdata, man); |
tree_man(curp->outdata, meta); |
break; |
break; |
case OUTT_MAN: |
case OUTT_MAN: |
mparse_copy(curp->mp); |
mparse_copy(curp->mp); |
Line 875 parse(struct curparse *curp, int fd, const char *file) |
|
Line 881 parse(struct curparse *curp, int fd, const char *file) |
|
case OUTT_UTF8: |
case OUTT_UTF8: |
case OUTT_LOCALE: |
case OUTT_LOCALE: |
case OUTT_PS: |
case OUTT_PS: |
terminal_man(curp->outdata, man); |
terminal_man(curp->outdata, meta); |
break; |
break; |
default: |
default: |
break; |
break; |