version 1.315, 2018/12/30 00:49:55 |
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 368 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 480 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 518 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); |