version 1.296, 2017/07/01 12:54:07 |
version 1.301, 2017/07/26 10:21:55 |
Line 111 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2 |
|
Line 111 static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2 |
|
static char help_arg[] = "help"; |
static char help_arg[] = "help"; |
static char *help_argv[] = {help_arg, NULL}; |
static char *help_argv[] = {help_arg, NULL}; |
static enum mandoclevel rc; |
static enum mandoclevel rc; |
|
static FILE *mmsg_stream; |
|
|
|
|
int |
int |
Line 190 main(int argc, char *argv[]) |
|
Line 191 main(int argc, char *argv[]) |
|
curp.mmin = MANDOCERR_MAX; |
curp.mmin = MANDOCERR_MAX; |
curp.outopts = &conf.output; |
curp.outopts = &conf.output; |
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1; |
|
mmsg_stream = stderr; |
|
|
use_pager = 1; |
use_pager = 1; |
tag_files = NULL; |
tag_files = NULL; |
Line 476 main(int argc, char *argv[]) |
|
Line 478 main(int argc, char *argv[]) |
|
parse(&curp, fd, *argv); |
parse(&curp, fd, *argv); |
else if (resp->form == FORM_SRC) { |
else if (resp->form == FORM_SRC) { |
/* For .so only; ignore failure. */ |
/* For .so only; ignore failure. */ |
chdir(conf.manpath.paths[resp->ipath]); |
(void)chdir(conf.manpath.paths[resp->ipath]); |
parse(&curp, fd, resp->file); |
parse(&curp, fd, resp->file); |
} else |
} else |
passthrough(resp->file, fd, |
passthrough(resp->file, fd, |
Line 763 parse(struct curparse *curp, int fd, const char *file) |
|
Line 765 parse(struct curparse *curp, int fd, const char *file) |
|
|
|
if (man == NULL) |
if (man == NULL) |
return; |
return; |
if (curp->mmin < MANDOCERR_STYLE) |
mandoc_xr_reset(); |
mandoc_xr_reset(); |
|
if (man->macroset == MACROSET_MDOC) { |
if (man->macroset == MACROSET_MDOC) { |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
if (curp->outtype != OUTT_TREE || !curp->outopts->noval) |
mdoc_validate(man); |
mdoc_validate(man); |
Line 816 parse(struct curparse *curp, int fd, const char *file) |
|
Line 817 parse(struct curparse *curp, int fd, const char *file) |
|
break; |
break; |
} |
} |
} |
} |
check_xr(file); |
if (curp->mmin < MANDOCERR_STYLE) |
|
check_xr(file); |
mparse_updaterc(curp->mp, &rc); |
mparse_updaterc(curp->mp, &rc); |
} |
} |
|
|
Line 833 check_xr(const char *file) |
|
Line 835 check_xr(const char *file) |
|
manpath_base(&paths); |
manpath_base(&paths); |
|
|
for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) { |
for (xr = mandoc_xr_get(); xr != NULL; xr = xr->next) { |
|
if (xr->line == -1) |
|
continue; |
search.arch = NULL; |
search.arch = NULL; |
search.sec = xr->sec; |
search.sec = xr->sec; |
search.outkey = NULL; |
search.outkey = NULL; |
Line 842 check_xr(const char *file) |
|
Line 846 check_xr(const char *file) |
|
continue; |
continue; |
if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz)) |
if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz)) |
continue; |
continue; |
mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec); |
if (xr->count == 1) |
|
mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec); |
|
else |
|
mandoc_asprintf(&cp, "Xr %s %s (%d times)", |
|
xr->name, xr->sec, xr->count); |
mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE, |
mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE, |
file, xr->line, xr->pos + 1, cp); |
file, xr->line, xr->pos + 1, cp); |
free(cp); |
free(cp); |
Line 988 toptions(struct curparse *curp, char *arg) |
|
Line 996 toptions(struct curparse *curp, char *arg) |
|
else if (0 == strcmp(arg, "lint")) { |
else if (0 == strcmp(arg, "lint")) { |
curp->outtype = OUTT_LINT; |
curp->outtype = OUTT_LINT; |
curp->mmin = MANDOCERR_BASE; |
curp->mmin = MANDOCERR_BASE; |
|
mmsg_stream = stdout; |
} else if (0 == strcmp(arg, "tree")) |
} else if (0 == strcmp(arg, "tree")) |
curp->outtype = OUTT_TREE; |
curp->outtype = OUTT_TREE; |
else if (0 == strcmp(arg, "man")) |
else if (0 == strcmp(arg, "man")) |
Line 1077 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
Line 1086 mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
{ |
{ |
const char *mparse_msg; |
const char *mparse_msg; |
|
|
fprintf(stderr, "%s: %s:", getprogname(), |
fprintf(mmsg_stream, "%s: %s:", getprogname(), |
file == NULL ? "<stdin>" : file); |
file == NULL ? "<stdin>" : file); |
|
|
if (line) |
if (line) |
fprintf(stderr, "%d:%d:", line, col + 1); |
fprintf(mmsg_stream, "%d:%d:", line, col + 1); |
|
|
fprintf(stderr, " %s", |
fprintf(mmsg_stream, " %s", mparse_strlevel(lvl)); |
t < MANDOCERR_STYLE ? "BASE" : mparse_strlevel(lvl)); |
|
|
|
if ((mparse_msg = mparse_strerror(t)) != NULL) |
if ((mparse_msg = mparse_strerror(t)) != NULL) |
fprintf(stderr, ": %s", mparse_msg); |
fprintf(mmsg_stream, ": %s", mparse_msg); |
|
|
if (msg) |
if (msg) |
fprintf(stderr, ": %s", msg); |
fprintf(mmsg_stream, ": %s", msg); |
|
|
fputc('\n', stderr); |
fputc('\n', mmsg_stream); |
} |
} |
|
|
static pid_t |
static pid_t |