version 1.279, 2017/01/09 17:49:57 |
version 1.281, 2017/02/10 15:45:28 |
Line 123 main(int argc, char *argv[]) |
|
Line 123 main(int argc, char *argv[]) |
|
struct manpage *res, *resp; |
struct manpage *res, *resp; |
char *conf_file, *defpaths; |
char *conf_file, *defpaths; |
const char *sec; |
const char *sec; |
|
const char *thisarg; |
size_t i, sz; |
size_t i, sz; |
int prio, best_prio; |
int prio, best_prio; |
enum outmode outmode; |
enum outmode outmode; |
Line 247 main(int argc, char *argv[]) |
|
Line 248 main(int argc, char *argv[]) |
|
break; |
break; |
case 'O': |
case 'O': |
search.outkey = optarg; |
search.outkey = optarg; |
while (optarg != NULL) |
while (optarg != NULL) { |
manconf_output(&conf.output, |
thisarg = optarg; |
strsep(&optarg, ",")); |
if (manconf_output(&conf.output, |
|
strsep(&optarg, ","), 0) == 0) |
|
continue; |
|
warnx("-O %s: Bad argument", thisarg); |
|
return (int)MANDOCLEVEL_BADARG; |
|
} |
break; |
break; |
case 'S': |
case 'S': |
search.arch = optarg; |
search.arch = optarg; |
Line 736 parse(struct curparse *curp, int fd, const char *file) |
|
Line 742 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 766 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); |