version 1.279, 2017/01/09 17:49:57 |
version 1.282, 2017/02/16 10:56:07 |
|
|
main(int argc, char *argv[]) |
main(int argc, char *argv[]) |
{ |
{ |
struct manconf conf; |
struct manconf conf; |
struct curparse curp; |
|
struct mansearch search; |
struct mansearch search; |
|
struct curparse curp; |
struct tag_files *tag_files; |
struct tag_files *tag_files; |
const char *progname; |
|
char *auxpaths; |
|
char *defos; |
|
unsigned char *uc; |
|
struct manpage *res, *resp; |
struct manpage *res, *resp; |
char *conf_file, *defpaths; |
const char *progname, *sec, *thisarg; |
const char *sec; |
char *conf_file, *defpaths, *auxpaths; |
|
char *defos, *oarg; |
|
unsigned char *uc; |
size_t i, sz; |
size_t i, sz; |
int prio, best_prio; |
int prio, best_prio; |
enum outmode outmode; |
enum outmode outmode; |
Line 168 main(int argc, char *argv[]) |
|
Line 166 main(int argc, char *argv[]) |
|
|
|
memset(&search, 0, sizeof(struct mansearch)); |
memset(&search, 0, sizeof(struct mansearch)); |
search.outkey = "Nd"; |
search.outkey = "Nd"; |
|
oarg = NULL; |
|
|
if (strcmp(progname, BINM_MAN) == 0) |
if (strcmp(progname, BINM_MAN) == 0) |
search.argmode = ARG_NAME; |
search.argmode = ARG_NAME; |
Line 246 main(int argc, char *argv[]) |
|
Line 245 main(int argc, char *argv[]) |
|
auxpaths = optarg; |
auxpaths = optarg; |
break; |
break; |
case 'O': |
case 'O': |
search.outkey = optarg; |
oarg = optarg; |
while (optarg != NULL) |
|
manconf_output(&conf.output, |
|
strsep(&optarg, ",")); |
|
break; |
break; |
case 'S': |
case 'S': |
search.arch = optarg; |
search.arch = optarg; |
Line 294 main(int argc, char *argv[]) |
|
Line 290 main(int argc, char *argv[]) |
|
} |
} |
} |
} |
|
|
|
if (oarg != NULL) { |
|
if (outmode == OUTMODE_LST) |
|
search.outkey = oarg; |
|
else { |
|
while (oarg != NULL) { |
|
thisarg = oarg; |
|
if (manconf_output(&conf.output, |
|
strsep(&oarg, ","), 0) == 0) |
|
continue; |
|
warnx("-O %s: Bad argument", thisarg); |
|
return (int)MANDOCLEVEL_BADARG; |
|
} |
|
} |
|
} |
|
|
if (outmode == OUTMODE_FLN || |
if (outmode == OUTMODE_FLN || |
outmode == OUTMODE_LST || |
outmode == OUTMODE_LST || |
!isatty(STDOUT_FILENO)) |
!isatty(STDOUT_FILENO)) |
Line 736 parse(struct curparse *curp, int fd, const char *file) |
|
Line 747 parse(struct curparse *curp, int fd, const char *file) |
|
if (man == NULL) |
if (man == NULL) |
return; |
return; |
if (man->macroset == MACROSET_MDOC) { |
if (man->macroset == MACROSET_MDOC) { |
mdoc_validate(man); |
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, man); |
Line 759 parse(struct curparse *curp, int fd, const char *file) |
|
Line 771 parse(struct curparse *curp, int fd, const char *file) |
|
} |
} |
} |
} |
if (man->macroset == MACROSET_MAN) { |
if (man->macroset == MACROSET_MAN) { |
man_validate(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, man); |