version 1.311, 2018/12/13 11:55:46 |
version 1.318, 2019/01/11 17:04:44 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2010-2012, 2014-2018 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010-2012, 2014-2019 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> |
* Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
Line 82 struct curparse { |
|
Line 82 struct curparse { |
|
void *outdata; /* data for output */ |
void *outdata; /* data for output */ |
char *os_s; /* operating system for display */ |
char *os_s; /* operating system for display */ |
int wstop; /* stop after a file with a warning */ |
int wstop; /* stop after a file with a warning */ |
enum mandocerr mmin; /* ignore messages below this */ |
|
enum mandoc_os os_e; /* check base system conventions */ |
enum mandoc_os os_e; /* check base system conventions */ |
enum outt outtype; /* which output to use */ |
enum outt outtype; /* which output to use */ |
}; |
}; |
Line 90 struct curparse { |
|
Line 89 struct curparse { |
|
|
|
int mandocdb(int, char *[]); |
int mandocdb(int, char *[]); |
|
|
static void check_xr(const char *); |
static void check_xr(void); |
static int fs_lookup(const struct manpaths *, |
static int fs_lookup(const struct manpaths *, |
size_t ipath, const char *, |
size_t ipath, const char *, |
const char *, const char *, |
const char *, const char *, |
Line 100 static int fs_search(const struct mansearch *, |
|
Line 99 static int fs_search(const struct mansearch *, |
|
struct manpage **, size_t *); |
struct manpage **, size_t *); |
static int koptions(int *, char *); |
static int koptions(int *, char *); |
static void moptions(int *, char *); |
static void moptions(int *, char *); |
static void mmsg(enum mandocerr, enum mandoclevel, |
|
const char *, int, int, const char *); |
|
static void outdata_alloc(struct curparse *); |
static void outdata_alloc(struct curparse *); |
static void parse(struct curparse *, int, const char *); |
static void parse(struct curparse *, int, const char *); |
static void passthrough(const char *, int, int); |
static void passthrough(const char *, int, int); |
Line 113 static int woptions(struct curparse *, char *); |
|
Line 110 static int woptions(struct curparse *, char *); |
|
static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; |
static const int sec_prios[] = {1, 4, 5, 8, 6, 3, 7, 2, 9}; |
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 FILE *mmsg_stream; |
|
|
|
|
|
int |
int |
Line 128 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 153 main(int argc, char *argv[]) |
|
Line 148 main(int argc, char *argv[]) |
|
setprogname(progname); |
setprogname(progname); |
#endif |
#endif |
|
|
|
mandoc_msg_setoutfile(stderr); |
if (strncmp(progname, "mandocdb", 8) == 0 || |
if (strncmp(progname, "mandocdb", 8) == 0 || |
strcmp(progname, BINM_MAKEWHATIS) == 0) |
strcmp(progname, BINM_MAKEWHATIS) == 0) |
return mandocdb(argc, argv); |
return mandocdb(argc, argv); |
Line 192 main(int argc, char *argv[]) |
|
Line 188 main(int argc, char *argv[]) |
|
|
|
memset(&curp, 0, sizeof(struct curparse)); |
memset(&curp, 0, sizeof(struct curparse)); |
curp.outtype = OUTT_LOCALE; |
curp.outtype = OUTT_LOCALE; |
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 315 main(int argc, char *argv[]) |
|
Line 309 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 372 main(int argc, char *argv[]) |
|
Line 369 main(int argc, char *argv[]) |
|
#endif |
#endif |
} |
} |
|
|
rc = MANDOCLEVEL_OK; |
/* |
|
* 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 415 main(int argc, char *argv[]) |
|
Line 421 main(int argc, char *argv[]) |
|
if (sz == 0) { |
if (sz == 0) { |
if (search.argmode != ARG_NAME) |
if (search.argmode != ARG_NAME) |
warnx("nothing appropriate"); |
warnx("nothing appropriate"); |
rc = MANDOCLEVEL_BADARG; |
mandoc_msg_setrc(MANDOCLEVEL_BADARG); |
goto out; |
goto out; |
} |
} |
|
|
Line 483 main(int argc, char *argv[]) |
|
Line 489 main(int argc, char *argv[]) |
|
moptions(&options, auxpaths); |
moptions(&options, auxpaths); |
|
|
mchars_alloc(); |
mchars_alloc(); |
curp.mp = mparse_alloc(options, curp.mmin, mmsg, |
curp.mp = mparse_alloc(options, curp.os_e, curp.os_s); |
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(); |
parse(&curp, STDIN_FILENO, "<stdin>"); |
tag_files->tagname = conf.output.tag; |
|
} |
|
thisarg = "<stdin>"; |
|
mandoc_msg_setinfilename(thisarg); |
|
parse(&curp, STDIN_FILENO, thisarg); |
|
mandoc_msg_setinfilename(NULL); |
} |
} |
|
|
/* |
/* |
Line 513 main(int argc, char *argv[]) |
|
Line 523 main(int argc, char *argv[]) |
|
(void)chdir(conf.manpath.paths[resp->ipath]); |
(void)chdir(conf.manpath.paths[resp->ipath]); |
else if (startdir != -1) |
else if (startdir != -1) |
(void)fchdir(startdir); |
(void)fchdir(startdir); |
} |
thisarg = resp->file; |
|
} else |
|
thisarg = *argv; |
|
|
fd = mparse_open(curp.mp, resp != NULL ? resp->file : *argv); |
fd = mparse_open(curp.mp, thisarg); |
if (fd != -1) { |
if (fd != -1) { |
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; |
|
} |
} |
|
|
if (resp == NULL) |
mandoc_msg_setinfilename(thisarg); |
parse(&curp, fd, *argv); |
if (resp == NULL || resp->form == FORM_SRC) |
else if (resp->form == FORM_SRC) |
parse(&curp, fd, thisarg); |
parse(&curp, fd, resp->file); |
|
else |
else |
passthrough(resp->file, fd, |
passthrough(resp->file, fd, |
conf.output.synopsisonly); |
conf.output.synopsisonly); |
|
mandoc_msg_setinfilename(NULL); |
|
|
if (ferror(stdout)) { |
if (ferror(stdout)) { |
if (tag_files != NULL) { |
if (tag_files != NULL) { |
Line 542 main(int argc, char *argv[]) |
|
Line 550 main(int argc, char *argv[]) |
|
tag_files = NULL; |
tag_files = NULL; |
} else |
} else |
warn("stdout"); |
warn("stdout"); |
rc = MANDOCLEVEL_SYSERR; |
mandoc_msg_setrc(MANDOCLEVEL_SYSERR); |
break; |
break; |
} |
} |
|
|
Line 551 main(int argc, char *argv[]) |
|
Line 559 main(int argc, char *argv[]) |
|
outdata_alloc(&curp); |
outdata_alloc(&curp); |
terminal_sepline(curp.outdata); |
terminal_sepline(curp.outdata); |
} |
} |
} else if (rc < MANDOCLEVEL_ERROR) |
} else |
rc = MANDOCLEVEL_ERROR; |
mandoc_msg(MANDOCERR_FILE, 0, 0, |
|
"%s: %s", thisarg, strerror(errno)); |
|
|
if (MANDOCLEVEL_OK != rc && curp.wstop) |
if (curp.wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK) |
break; |
break; |
|
|
if (resp != NULL) |
if (resp != NULL) |
|
|
|
|
if (pid == -1) { |
if (pid == -1) { |
warn("wait"); |
warn("wait"); |
rc = MANDOCLEVEL_SYSERR; |
mandoc_msg_setrc(MANDOCLEVEL_SYSERR); |
break; |
break; |
} |
} |
if (!WIFSTOPPED(status)) |
if (!WIFSTOPPED(status)) |
|
|
} |
} |
tag_unlink(); |
tag_unlink(); |
} |
} |
|
return (int)mandoc_msg_getrc(); |
return (int)rc; |
|
} |
} |
|
|
static void |
static void |
Line 806 fs_search(const struct mansearch *cfg, const struct ma |
|
Line 814 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) |
{ |
{ |
enum mandoclevel rctmp; |
struct roff_meta *meta; |
struct roff_man *man; |
|
|
|
/* Begin by parsing the file itself. */ |
/* Begin by parsing the file itself. */ |
|
|
assert(file); |
assert(file); |
assert(fd >= 0); |
assert(fd >= 0); |
|
|
rctmp = mparse_readfd(curp->mp, fd, file); |
mparse_readfd(curp->mp, fd, file); |
if (fd != STDIN_FILENO) |
if (fd != STDIN_FILENO) |
close(fd); |
close(fd); |
if (rc < rctmp) |
|
rc = rctmp; |
|
|
|
/* |
/* |
* With -Wstop and warnings or errors of at least the requested |
* With -Wstop and warnings or errors of at least the requested |
* level, do not produce output. |
* level, do not produce output. |
*/ |
*/ |
|
|
if (rctmp != MANDOCLEVEL_OK && curp->wstop) |
if (curp->wstop && mandoc_msg_getrc() != MANDOCLEVEL_OK) |
return; |
return; |
|
|
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 883 parse(struct curparse *curp, int fd, const char *file) |
|
Line 882 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; |
} |
} |
} |
} |
if (curp->mmin < MANDOCERR_STYLE) |
if (mandoc_msg_getmin() < MANDOCERR_STYLE) |
check_xr(file); |
check_xr(); |
mparse_updaterc(curp->mp, &rc); |
|
} |
} |
|
|
static void |
static void |
check_xr(const char *file) |
check_xr(void) |
{ |
{ |
static struct manpaths paths; |
static struct manpaths paths; |
struct mansearch search; |
struct mansearch search; |
struct mandoc_xr *xr; |
struct mandoc_xr *xr; |
char *cp; |
|
size_t sz; |
size_t sz; |
|
|
if (paths.sz == 0) |
if (paths.sz == 0) |
Line 919 check_xr(const char *file) |
|
Line 916 check_xr(const char *file) |
|
if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz)) |
if (fs_search(&search, &paths, 1, &xr->name, NULL, &sz)) |
continue; |
continue; |
if (xr->count == 1) |
if (xr->count == 1) |
mandoc_asprintf(&cp, "Xr %s %s", xr->name, xr->sec); |
mandoc_msg(MANDOCERR_XR_BAD, xr->line, |
|
xr->pos + 1, "Xr %s %s", xr->name, xr->sec); |
else |
else |
mandoc_asprintf(&cp, "Xr %s %s (%d times)", |
mandoc_msg(MANDOCERR_XR_BAD, xr->line, |
|
xr->pos + 1, "Xr %s %s (%d times)", |
xr->name, xr->sec, xr->count); |
xr->name, xr->sec, xr->count); |
mmsg(MANDOCERR_XR_BAD, MANDOCLEVEL_STYLE, |
|
file, xr->line, xr->pos + 1, cp); |
|
free(cp); |
|
} |
} |
} |
} |
|
|
|
|
fail: |
fail: |
free(line); |
free(line); |
warn("%s: SYSERR: %s", file, syscall); |
warn("%s: SYSERR: %s", file, syscall); |
if (rc < MANDOCLEVEL_SYSERR) |
mandoc_msg_setrc(MANDOCLEVEL_SYSERR); |
rc = MANDOCLEVEL_SYSERR; |
|
} |
} |
|
|
static int |
static int |
Line 1067 toptions(struct curparse *curp, char *arg) |
|
Line 1062 toptions(struct curparse *curp, char *arg) |
|
curp->outtype = OUTT_ASCII; |
curp->outtype = OUTT_ASCII; |
else if (0 == strcmp(arg, "lint")) { |
else if (0 == strcmp(arg, "lint")) { |
curp->outtype = OUTT_LINT; |
curp->outtype = OUTT_LINT; |
curp->mmin = MANDOCERR_BASE; |
mandoc_msg_setoutfile(stdout); |
mmsg_stream = stdout; |
mandoc_msg_setmin(MANDOCERR_BASE); |
} 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 1119 woptions(struct curparse *curp, char *arg) |
|
Line 1114 woptions(struct curparse *curp, char *arg) |
|
break; |
break; |
case 1: |
case 1: |
case 2: |
case 2: |
curp->mmin = MANDOCERR_BASE; |
mandoc_msg_setmin(MANDOCERR_BASE); |
break; |
break; |
case 3: |
case 3: |
curp->mmin = MANDOCERR_STYLE; |
mandoc_msg_setmin(MANDOCERR_STYLE); |
break; |
break; |
case 4: |
case 4: |
curp->mmin = MANDOCERR_WARNING; |
mandoc_msg_setmin(MANDOCERR_WARNING); |
break; |
break; |
case 5: |
case 5: |
curp->mmin = MANDOCERR_ERROR; |
mandoc_msg_setmin(MANDOCERR_ERROR); |
break; |
break; |
case 6: |
case 6: |
curp->mmin = MANDOCERR_UNSUPP; |
mandoc_msg_setmin(MANDOCERR_UNSUPP); |
break; |
break; |
case 7: |
case 7: |
curp->mmin = MANDOCERR_MAX; |
mandoc_msg_setmin(MANDOCERR_MAX); |
break; |
break; |
case 8: |
case 8: |
curp->mmin = MANDOCERR_BASE; |
mandoc_msg_setmin(MANDOCERR_BASE); |
curp->os_e = MANDOC_OS_OPENBSD; |
curp->os_e = MANDOC_OS_OPENBSD; |
break; |
break; |
case 9: |
case 9: |
curp->mmin = MANDOCERR_BASE; |
mandoc_msg_setmin(MANDOCERR_BASE); |
curp->os_e = MANDOC_OS_NETBSD; |
curp->os_e = MANDOC_OS_NETBSD; |
break; |
break; |
default: |
default: |
Line 1150 woptions(struct curparse *curp, char *arg) |
|
Line 1145 woptions(struct curparse *curp, char *arg) |
|
} |
} |
} |
} |
return 1; |
return 1; |
} |
|
|
|
static void |
|
mmsg(enum mandocerr t, enum mandoclevel lvl, |
|
const char *file, int line, int col, const char *msg) |
|
{ |
|
const char *mparse_msg; |
|
|
|
fprintf(mmsg_stream, "%s: %s:", getprogname(), |
|
file == NULL ? "<stdin>" : file); |
|
|
|
if (line) |
|
fprintf(mmsg_stream, "%d:%d:", line, col + 1); |
|
|
|
fprintf(mmsg_stream, " %s", mparse_strlevel(lvl)); |
|
|
|
if ((mparse_msg = mparse_strerror(t)) != NULL) |
|
fprintf(mmsg_stream, ": %s", mparse_msg); |
|
|
|
if (msg) |
|
fprintf(mmsg_stream, ": %s", msg); |
|
|
|
fputc('\n', mmsg_stream); |
|
} |
} |
|
|
static pid_t |
static pid_t |