=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.20 retrieving revision 1.164 diff -u -p -r1.20 -r1.164 --- mandoc/main.c 2009/04/02 16:37:40 1.20 +++ mandoc/main.c 2011/09/17 15:00:51 1.164 @@ -1,153 +1,121 @@ -/* $Id: main.c,v 1.20 2009/04/02 16:37:40 kristaps Exp $ */ +/* $Id: main.c,v 1.164 2011/09/17 15:00:51 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2010, 2011 Ingo Schwarze * * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the - * above copyright notice and this permission notice appear in all - * copies. + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL - * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE - * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL - * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR - * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif #include -#include -#include #include +#include #include #include #include +#include "mandoc.h" +#include "main.h" #include "mdoc.h" #include "man.h" -/* Account for FreeBSD and Linux in our declarations. */ - -#ifdef __linux__ -extern int getsubopt(char **, char * const *, char **); -# ifndef __dead -# define __dead __attribute__((__noreturn__)) +#if !defined(__GNUC__) || (__GNUC__ < 2) +# if !defined(lint) +# define __attribute__(x) # endif -#elif defined(__dead2) -# ifndef __dead -# define __dead __dead2 -# endif -#endif +#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */ -struct buf { - char *buf; - size_t sz; -}; +typedef void (*out_mdoc)(void *, const struct mdoc *); +typedef void (*out_man)(void *, const struct man *); +typedef void (*out_free)(void *); -enum intt { - INTT_AUTO, - INTT_MDOC, - INTT_MAN -}; - enum outt { - OUTT_ASCII = 0, - OUTT_TREE, - OUTT_LINT + OUTT_ASCII = 0, /* -Tascii */ + OUTT_LOCALE, /* -Tlocale */ + OUTT_UTF8, /* -Tutf8 */ + OUTT_TREE, /* -Ttree */ + OUTT_MAN, /* -Tman */ + OUTT_HTML, /* -Thtml */ + OUTT_XHTML, /* -Txhtml */ + OUTT_LINT, /* -Tlint */ + OUTT_PS, /* -Tps */ + OUTT_PDF /* -Tpdf */ }; struct curparse { - const char *file; - int fd; - int wflags; -#define WARN_WALL 0x03 /* All-warnings mask. */ -#define WARN_WCOMPAT (1 << 0) /* Compatibility warnings. */ -#define WARN_WSYNTAX (1 << 1) /* Syntax warnings. */ -#define WARN_WERR (1 << 2) /* Warnings->errors. */ - int fflags; - enum intt inttype; - struct man *man; - struct mdoc *mdoc; + struct mparse *mp; + enum mandoclevel wlevel; /* ignore messages below this */ + int wstop; /* stop after a file with a warning */ + enum outt outtype; /* which output to use */ + out_mdoc outmdoc; /* mdoc output ptr */ + out_man outman; /* man output ptr */ + out_free outfree; /* free output ptr */ + void *outdata; /* data for output */ + char outopts[BUFSIZ]; /* buf of output opts */ }; -#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ -#define IGN_ESCAPE (1 << 1) /* Ignore bad escapes. */ -#define IGN_MACRO (1 << 2) /* Ignore unknown macros. */ -#define NO_IGN_MACRO (1 << 3) +static int moptions(enum mparset *, char *); +static void mmsg(enum mandocerr, enum mandoclevel, + const char *, int, int, const char *); +static void parse(struct curparse *, int, + const char *, enum mandoclevel *); +static int toptions(struct curparse *, char *); +static void usage(void) __attribute__((noreturn)); +static void version(void) __attribute__((noreturn)); +static int woptions(struct curparse *, char *); -typedef int (*out_run)(void *, const struct man *, - const struct mdoc *); -typedef void (*out_free)(void *); +static const char *progname; -extern char *__progname; - -extern void *ascii_alloc(void); -extern int terminal_run(void *, const struct man *, - const struct mdoc *); -extern int tree_run(void *, const struct man *, - const struct mdoc *); -extern void terminal_free(void *); - -static int foptions(int *, char *); -static int toptions(enum outt *, char *); -static int moptions(enum intt *, char *); -static int woptions(int *, char *); -static int merr(void *, int, int, const char *); -static int manwarn(void *, int, int, const char *); -static int mdocwarn(void *, int, int, - enum mdoc_warn, const char *); -static int fstdin(struct buf *, struct buf *, - struct curparse *); -static int ffile(struct buf *, struct buf *, - const char *, struct curparse *); -static int fdesc(struct buf *, struct buf *, - struct curparse *); -static int pset(const char *, size_t, struct curparse *, - struct man **, struct mdoc **); -static struct man *man_init(struct curparse *); -static struct mdoc *mdoc_init(struct curparse *); -__dead static void version(void); -__dead static void usage(void); - - int main(int argc, char *argv[]) { - int c, rc; - void *outdata; - enum outt outtype; - struct buf ln, blk; - out_run outrun; - out_free outfree; + int c; struct curparse curp; + enum mparset type; + enum mandoclevel rc; - outtype = OUTT_ASCII; + progname = strrchr(argv[0], '/'); + if (progname == NULL) + progname = argv[0]; + else + ++progname; - bzero(&curp, sizeof(struct curparse)); + memset(&curp, 0, sizeof(struct curparse)); - curp.inttype = INTT_AUTO; + type = MPARSE_AUTO; + curp.outtype = OUTT_ASCII; + curp.wlevel = MANDOCLEVEL_FATAL; /* LINTED */ - while (-1 != (c = getopt(argc, argv, "f:m:VW:T:"))) + while (-1 != (c = getopt(argc, argv, "m:O:T:VW:"))) switch (c) { - case ('f'): - if ( ! foptions(&curp.fflags, optarg)) - return(0); - break; case ('m'): - if ( ! moptions(&curp.inttype, optarg)) - return(0); + if ( ! moptions(&type, optarg)) + return((int)MANDOCLEVEL_BADARG); break; + case ('O'): + (void)strlcat(curp.outopts, optarg, BUFSIZ); + (void)strlcat(curp.outopts, ",", BUFSIZ); + break; case ('T'): - if ( ! toptions(&outtype, optarg)) - return(0); + if ( ! toptions(&curp, optarg)) + return((int)MANDOCLEVEL_BADARG); break; case ('W'): - if ( ! woptions(&curp.wflags, optarg)) - return(0); + if ( ! woptions(&curp, optarg)) + return((int)MANDOCLEVEL_BADARG); break; case ('V'): version(); @@ -157,530 +125,270 @@ main(int argc, char *argv[]) /* NOTREACHED */ } + curp.mp = mparse_alloc(type, curp.wlevel, mmsg, &curp); + argc -= optind; argv += optind; - /* - * Allocate the appropriate front-end. Note that utf8, latin1 - * (both not yet implemented) and ascii all resolve to the - * terminal front-end with different encodings (see terminal.c). - * Not all frontends have cleanup or alloc routines. - */ + rc = MANDOCLEVEL_OK; - switch (outtype) { - case (OUTT_TREE): - outdata = NULL; - outrun = tree_run; - outfree = NULL; - break; - case (OUTT_LINT): - outdata = NULL; - outrun = NULL; - outfree = NULL; - break; - default: - outdata = ascii_alloc(); - outrun = terminal_run; - outfree = terminal_free; - break; - } + if (NULL == *argv) + parse(&curp, STDIN_FILENO, "", &rc); - /* Configure buffers. */ - - bzero(&ln, sizeof(struct buf)); - bzero(&blk, sizeof(struct buf)); - - /* - * Main loop around available files. - */ - - if (NULL == *argv) { - rc = 0; - c = fstdin(&blk, &ln, &curp); - - if (c && NULL == outrun) - rc = 1; - /*else if (c && outrun && (*outrun)(outdata, curp.man, curp.mdoc)) - rc = 1;*/ - } else { - while (*argv) { - c = ffile(&blk, &ln, *argv, &curp); - if ( ! c) - break; - /*if (outrun && ! (*outrun)(outdata, curp.man, curp.mdoc)) - break;*/ - if (curp.man) - man_reset(curp.man); - if (curp.mdoc && ! mdoc_reset(curp.mdoc)) { - warnx("memory exhausted"); - break; - } - argv++; - } - rc = NULL == *argv; + while (*argv) { + parse(&curp, -1, *argv, &rc); + if (MANDOCLEVEL_OK != rc && curp.wstop) + break; + ++argv; } - if (blk.buf) - free(blk.buf); - if (ln.buf) - free(ln.buf); - if (outfree) - (*outfree)(outdata); - if (curp.mdoc) - mdoc_free(curp.mdoc); - if (curp.man) - man_free(curp.man); + if (curp.outfree) + (*curp.outfree)(curp.outdata); + if (curp.mp) + mparse_free(curp.mp); - return(rc ? EXIT_SUCCESS : EXIT_FAILURE); + return((int)rc); } - -__dead static void +static void version(void) { - (void)printf("%s %s\n", __progname, VERSION); - exit(EXIT_SUCCESS); + printf("%s %s\n", progname, VERSION); + exit((int)MANDOCLEVEL_OK); } - -__dead static void +static void usage(void) { - (void)fprintf(stderr, "usage: %s [-V] [-foption...] " - "[-mformat] [-Toutput] [-Werr...]\n", - __progname); - exit(EXIT_FAILURE); -} + fprintf(stderr, "usage: %s " + "[-V] " + "[-foption] " + "[-mformat] " + "[-Ooption] " + "[-Toutput] " + "[-Wlevel] " + "[file...]\n", + progname); - -static struct man * -man_init(struct curparse *curp) -{ - int pflags; - struct man *man; - struct man_cb mancb; - - mancb.man_err = merr; - mancb.man_warn = manwarn; - - /* Set command defaults. */ - pflags = MAN_IGN_MACRO; - - if (curp->fflags & IGN_MACRO) - pflags |= MAN_IGN_MACRO; - if (curp->fflags & NO_IGN_MACRO) - pflags &= ~MAN_IGN_MACRO; - - if (NULL == (man = man_alloc(curp, pflags, &mancb))) - warnx("memory exhausted"); - - return(man); + exit((int)MANDOCLEVEL_BADARG); } - -static struct mdoc * -mdoc_init(struct curparse *curp) +static void +parse(struct curparse *curp, int fd, + const char *file, enum mandoclevel *level) { - int pflags; - struct mdoc *mdoc; - struct mdoc_cb mdoccb; + enum mandoclevel rc; + struct mdoc *mdoc; + struct man *man; - mdoccb.mdoc_msg = NULL; - mdoccb.mdoc_err = merr; - mdoccb.mdoc_warn = mdocwarn; + /* Begin by parsing the file itself. */ - pflags = 0; + assert(file); + assert(fd >= -1); - if (curp->fflags & IGN_SCOPE) - pflags |= MDOC_IGN_SCOPE; - if (curp->fflags & IGN_ESCAPE) - pflags |= MDOC_IGN_ESCAPE; - if (curp->fflags & IGN_MACRO) - pflags |= MDOC_IGN_MACRO; + rc = mparse_readfd(curp->mp, fd, file); - if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb))) - warnx("memory allocated"); + /* Stop immediately if the parse has failed. */ - return(mdoc); -} + if (MANDOCLEVEL_FATAL <= rc) + goto cleanup; - -static int -fstdin(struct buf *blk, struct buf *ln, struct curparse *curp) -{ - - curp->file = ""; - curp->fd = STDIN_FILENO; - return(fdesc(blk, ln, curp)); -} - - -static int -ffile(struct buf *blk, struct buf *ln, - const char *file, struct curparse *curp) -{ - int c; - - curp->file = file; - if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { - warn("%s", curp->file); - return(0); - } - - c = fdesc(blk, ln, curp); - - if (-1 == close(curp->fd)) - warn("%s", curp->file); - - return(c); -} - - -static int -fdesc(struct buf *blk, struct buf *ln, struct curparse *curp) -{ - size_t sz; - ssize_t ssz; - struct stat st; - int j, i, pos, lnn; - struct man *man; - struct mdoc *mdoc; - - sz = BUFSIZ; - man = NULL; - mdoc = NULL; - /* - * Two buffers: ln and buf. buf is the input buffer optimised - * here for each file's block size. ln is a line buffer. Both - * growable, hence passed in by ptr-ptr. + * With -Wstop and warnings or errors of at least the requested + * level, do not produce output. */ - if (-1 == fstat(curp->fd, &st)) - warnx("%s", curp->file); - else if ((size_t)st.st_blksize > sz) - sz = st.st_blksize; + if (MANDOCLEVEL_OK != rc && curp->wstop) + goto cleanup; - if (sz > blk->sz) { - blk->buf = realloc(blk->buf, sz); - if (NULL == blk->buf) { - warn("realloc"); - return(0); - } - blk->sz = sz; - } + /* If unset, allocate output dev now (if applicable). */ - /* Fill buf with file blocksize. */ - - for (lnn = 0, pos = 0; ; ) { - if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { - warn("%s", curp->file); - return(0); - } else if (0 == ssz) + if ( ! (curp->outman && curp->outmdoc)) { + switch (curp->outtype) { + case (OUTT_XHTML): + curp->outdata = xhtml_alloc(curp->outopts); + curp->outfree = html_free; break; + case (OUTT_HTML): + curp->outdata = html_alloc(curp->outopts); + curp->outfree = html_free; + break; + case (OUTT_UTF8): + curp->outdata = utf8_alloc(curp->outopts); + curp->outfree = ascii_free; + break; + case (OUTT_LOCALE): + curp->outdata = locale_alloc(curp->outopts); + curp->outfree = ascii_free; + break; + case (OUTT_ASCII): + curp->outdata = ascii_alloc(curp->outopts); + curp->outfree = ascii_free; + break; + case (OUTT_PDF): + curp->outdata = pdf_alloc(curp->outopts); + curp->outfree = pspdf_free; + break; + case (OUTT_PS): + curp->outdata = ps_alloc(curp->outopts); + curp->outfree = pspdf_free; + break; + default: + break; + } - /* Parse the read block into partial or full lines. */ - - for (i = 0; i < (int)ssz; i++) { - if (pos >= (int)ln->sz) { - ln->sz += 256; /* Step-size. */ - ln->buf = realloc(ln->buf, ln->sz); - if (NULL == ln->buf) { - warn("realloc"); - return(0); - } - } - - if ('\n' != blk->buf[i]) { - ln->buf[pos++] = blk->buf[i]; - continue; - } - - /* Check for CPP-escaped newline. */ - - if (pos > 0 && '\\' == ln->buf[pos - 1]) { - for (j = pos - 1; j >= 0; j--) - if ('\\' != ln->buf[j]) - break; - - if ( ! ((pos - j) % 2)) { - pos--; - lnn++; - continue; - } - } - - ln->buf[pos] = 0; - lnn++; - - /* - * If no manual parser has been assigned, then - * try to assign one in pset(), which may do - * nothing at all. After this, parse the manual - * line accordingly. - */ - - if ( ! (man || mdoc) && ! pset(ln->buf, - pos, curp, &man, &mdoc)) - return(0); - - pos = 0; - - if (man && ! man_parseln(man, lnn, ln->buf)) - return(0); - if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf)) - return(0); + switch (curp->outtype) { + case (OUTT_HTML): + /* FALLTHROUGH */ + case (OUTT_XHTML): + curp->outman = html_man; + curp->outmdoc = html_mdoc; + break; + case (OUTT_TREE): + curp->outman = tree_man; + curp->outmdoc = tree_mdoc; + break; + case (OUTT_MAN): + curp->outmdoc = man_mdoc; + break; + case (OUTT_PDF): + /* FALLTHROUGH */ + case (OUTT_ASCII): + /* FALLTHROUGH */ + case (OUTT_UTF8): + /* FALLTHROUGH */ + case (OUTT_LOCALE): + /* FALLTHROUGH */ + case (OUTT_PS): + curp->outman = terminal_man; + curp->outmdoc = terminal_mdoc; + break; + default: + break; } } - /* Note that a parser may not have been assigned, yet. */ + mparse_result(curp->mp, &mdoc, &man); - if (mdoc) - return(mdoc_endparse(mdoc)); - if (man) - return(man_endparse(man)); + /* Execute the out device, if it exists. */ - warnx("%s: not a manual", curp->file); - return(0); -} + if (man && curp->outman) + (*curp->outman)(curp->outdata, man); + if (mdoc && curp->outmdoc) + (*curp->outmdoc)(curp->outdata, mdoc); + cleanup: -static int -pset(const char *buf, size_t pos, struct curparse *curp, - struct man **man, struct mdoc **mdoc) -{ + mparse_reset(curp->mp); - /* - * Try to intuit which kind of manual parser should be used. If - * passed in by command-line (-man, -mdoc), then use that - * explicitly. If passed as -mandoc, then try to guess from the - * line: either skip comments, use -mdoc when finding `.Dt', or - * default to -man, which is more lenient. - */ - - if (pos >= 3 && 0 == memcmp(buf, ".\\\"", 3)) - return(1); - - switch (curp->inttype) { - case (INTT_MDOC): - if (NULL == curp->mdoc) - curp->mdoc = mdoc_init(curp); - if (NULL == (*mdoc = curp->mdoc)) - return(0); - warnx("inheriting -mdoc parser"); - return(1); - case (INTT_MAN): - if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) - return(0); - warnx("inheriting -man parser"); - return(1); - default: - break; - } - - if (pos >= 3 && 0 == memcmp(buf, ".Dd", 3)) { - if (NULL == curp->mdoc) - curp->mdoc = mdoc_init(curp); - if (NULL == (*mdoc = curp->mdoc)) - return(0); - return(1); - } - - if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) - return(0); - return(1); + if (*level < rc) + *level = rc; } - static int -moptions(enum intt *tflags, char *arg) +moptions(enum mparset *tflags, char *arg) { if (0 == strcmp(arg, "doc")) - *tflags = INTT_MDOC; + *tflags = MPARSE_MDOC; else if (0 == strcmp(arg, "andoc")) - *tflags = INTT_AUTO; + *tflags = MPARSE_AUTO; else if (0 == strcmp(arg, "an")) - *tflags = INTT_MAN; + *tflags = MPARSE_MAN; else { - warnx("bad argument: -m%s", arg); + fprintf(stderr, "%s: Bad argument\n", arg); return(0); } return(1); } - static int -toptions(enum outt *tflags, char *arg) +toptions(struct curparse *curp, char *arg) { if (0 == strcmp(arg, "ascii")) - *tflags = OUTT_ASCII; - else if (0 == strcmp(arg, "lint")) - *tflags = OUTT_LINT; - else if (0 == strcmp(arg, "tree")) - *tflags = OUTT_TREE; + curp->outtype = OUTT_ASCII; + else if (0 == strcmp(arg, "lint")) { + curp->outtype = OUTT_LINT; + curp->wlevel = MANDOCLEVEL_WARNING; + } else if (0 == strcmp(arg, "tree")) + curp->outtype = OUTT_TREE; + else if (0 == strcmp(arg, "man")) + curp->outtype = OUTT_MAN; + else if (0 == strcmp(arg, "html")) + curp->outtype = OUTT_HTML; + else if (0 == strcmp(arg, "utf8")) + curp->outtype = OUTT_UTF8; + else if (0 == strcmp(arg, "locale")) + curp->outtype = OUTT_LOCALE; + else if (0 == strcmp(arg, "xhtml")) + curp->outtype = OUTT_XHTML; + else if (0 == strcmp(arg, "ps")) + curp->outtype = OUTT_PS; + else if (0 == strcmp(arg, "pdf")) + curp->outtype = OUTT_PDF; else { - warnx("bad argument: -T%s", arg); + fprintf(stderr, "%s: Bad argument\n", arg); return(0); } return(1); } - -/* - * Parse out the options for [-fopt...] setting compiler options. These - * can be comma-delimited or called again. - */ static int -foptions(int *fflags, char *arg) +woptions(struct curparse *curp, char *arg) { - char *v; - char *toks[5]; + char *v, *o; + const char *toks[6]; - toks[0] = "ign-scope"; - toks[1] = "ign-escape"; - toks[2] = "ign-macro"; - toks[4] = "no-ign-macro"; + toks[0] = "stop"; + toks[1] = "all"; + toks[2] = "warning"; + toks[3] = "error"; + toks[4] = "fatal"; toks[5] = NULL; - while (*arg) - switch (getsubopt(&arg, toks, &v)) { + while (*arg) { + o = arg; + switch (getsubopt(&arg, UNCONST(toks), &v)) { case (0): - *fflags |= IGN_SCOPE; + curp->wstop = 1; break; case (1): - *fflags |= IGN_ESCAPE; - break; + /* FALLTHROUGH */ case (2): - *fflags |= IGN_MACRO; + curp->wlevel = MANDOCLEVEL_WARNING; break; case (3): - *fflags |= NO_IGN_MACRO; + curp->wlevel = MANDOCLEVEL_ERROR; break; - default: - warnx("bad argument: -f%s", arg); - return(0); - } - - return(1); -} - - -/* - * Parse out the options for [-Werr...], which sets warning modes. - * These can be comma-delimited or called again. - */ -static int -woptions(int *wflags, char *arg) -{ - char *v; - char *toks[5]; - - toks[0] = "all"; - toks[1] = "compat"; - toks[2] = "syntax"; - toks[3] = "error"; - toks[4] = NULL; - - while (*arg) - switch (getsubopt(&arg, toks, &v)) { - case (0): - *wflags |= WARN_WALL; + case (4): + curp->wlevel = MANDOCLEVEL_FATAL; break; - case (1): - *wflags |= WARN_WCOMPAT; - break; - case (2): - *wflags |= WARN_WSYNTAX; - break; - case (3): - *wflags |= WARN_WERR; - break; default: - warnx("bad argument: -W%s", arg); + fprintf(stderr, "-W%s: Bad argument\n", o); return(0); } + } return(1); } - -/* ARGSUSED */ -static int -merr(void *arg, int line, int col, const char *msg) +static void +mmsg(enum mandocerr t, enum mandoclevel lvl, + const char *file, int line, int col, const char *msg) { - struct curparse *curp; - curp = (struct curparse *)arg; + fprintf(stderr, "%s:%d:%d: %s: %s", + file, line, col + 1, + mparse_strlevel(lvl), + mparse_strerror(t)); - warnx("%s:%d: error: %s (column %d)", - curp->file, line, msg, col); - return(0); -} + if (msg) + fprintf(stderr, ": %s", msg); - -static int -mdocwarn(void *arg, int line, int col, - enum mdoc_warn type, const char *msg) -{ - struct curparse *curp; - char *wtype; - - curp = (struct curparse *)arg; - wtype = NULL; - - switch (type) { - case (WARN_COMPAT): - wtype = "compat"; - if (curp->wflags & WARN_WCOMPAT) - break; - return(1); - case (WARN_SYNTAX): - wtype = "syntax"; - if (curp->wflags & WARN_WSYNTAX) - break; - return(1); - } - - assert(wtype); - warnx("%s:%d: %s warning: %s (column %d)", - curp->file, line, wtype, msg, col); - - if ( ! (curp->wflags & WARN_WERR)) - return(1); - - warnx("%s: considering warnings as errors", - __progname); - return(0); -} - - -static int -manwarn(void *arg, int line, int col, const char *msg) -{ - struct curparse *curp; - - curp = (struct curparse *)arg; - - if ( ! (curp->wflags & WARN_WSYNTAX)) - return(1); - - warnx("%s:%d: syntax warning: %s (column %d)", - curp->file, line, msg, col); - - if ( ! (curp->wflags & WARN_WERR)) - return(1); - - warnx("%s: considering warnings as errors", - __progname); - return(0); + fputc('\n', stderr); }