=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.39 retrieving revision 1.177 diff -u -p -r1.39 -r1.177 --- mandoc/main.c 2009/07/24 14:00:59 1.39 +++ mandoc/main.c 2014/06/21 22:24:01 1.177 @@ -1,6 +1,8 @@ -/* $Id: main.c,v 1.39 2009/07/24 14:00:59 kristaps Exp $ */ +/* $Id: main.c,v 1.177 2014/06/21 22:24:01 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons + * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze + * Copyright (c) 2010 Joerg Sonnenberger * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -14,136 +16,127 @@ * 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 "mandoc_aux.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) */ -typedef int (*out_mdoc)(void *, const struct mdoc *); -typedef int (*out_man)(void *, const struct man *); +typedef void (*out_mdoc)(void *, const struct mdoc *); +typedef void (*out_man)(void *, const struct man *); typedef void (*out_free)(void *); -struct buf { - char *buf; - size_t sz; -}; - -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; /* Current parse. */ - int fd; /* Current parse. */ - int wflags; -#define WARN_WALL (1 << 0) /* All-warnings mask. */ -#define WARN_WERR (1 << 2) /* Warnings->errors. */ - int fflags; -#define IGN_SCOPE (1 << 0) /* Ignore scope errors. */ -#define NO_IGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ -#define NO_IGN_MACRO (1 << 2) /* Don't ignore bad macros. */ -#define NO_IGN_CHARS (1 << 3) /* Don't ignore bad chars. */ -#define IGN_ERRORS (1 << 4) /* Ignore failed parse. */ - enum intt inttype; /* Input parsers... */ - struct man *man; - struct man *lastman; - struct mdoc *mdoc; - struct mdoc *lastmdoc; - enum outt outtype; /* Output devices... */ - out_mdoc outmdoc; - out_man outman; - out_free outfree; - void *outdata; + 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 */ }; -extern void *ascii_alloc(void); -extern int tree_mdoc(void *, const struct mdoc *); -extern int tree_man(void *, const struct man *); -extern int terminal_mdoc(void *, const struct mdoc *); -extern int terminal_man(void *, const struct man *); -extern void terminal_free(void *); +static int moptions(int *, 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 *); -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 mwarn(void *, int, int, const char *); -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 *, int, 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); +static const char *progname; -extern char *__progname; - int main(int argc, char *argv[]) { - int c, rc; - struct buf ln, blk; + int c; struct curparse curp; + int options; + enum mandoclevel rc; + char *defos; - bzero(&curp, sizeof(struct curparse)); + progname = strrchr(argv[0], '/'); + if (progname == NULL) + progname = argv[0]; + else + ++progname; - curp.inttype = INTT_AUTO; + memset(&curp, 0, sizeof(struct curparse)); + + options = MPARSE_SO; curp.outtype = OUTT_ASCII; + curp.wlevel = MANDOCLEVEL_FATAL; + defos = NULL; - /* LINTED */ - while (-1 != (c = getopt(argc, argv, "f:m:VW:T:"))) + while (-1 != (c = getopt(argc, argv, "I:m:O:T:VW:"))) switch (c) { - case ('f'): - if ( ! foptions(&curp.fflags, optarg)) - return(EXIT_FAILURE); + case 'I': + if (strncmp(optarg, "os=", 3)) { + fprintf(stderr, + "%s: -I%s: Bad argument\n", + progname, optarg); + return((int)MANDOCLEVEL_BADARG); + } + if (defos) { + fprintf(stderr, + "%s: -I%s: Duplicate argument\n", + progname, optarg); + return((int)MANDOCLEVEL_BADARG); + } + defos = mandoc_strdup(optarg + 3); break; - case ('m'): - if ( ! moptions(&curp.inttype, optarg)) - return(EXIT_FAILURE); + case 'm': + if ( ! moptions(&options, optarg)) + return((int)MANDOCLEVEL_BADARG); break; - case ('T'): - if ( ! toptions(&curp.outtype, optarg)) - return(EXIT_FAILURE); + case 'O': + (void)strlcat(curp.outopts, optarg, BUFSIZ); + (void)strlcat(curp.outopts, ",", BUFSIZ); break; - case ('W'): - if ( ! woptions(&curp.wflags, optarg)) - return(EXIT_FAILURE); + case 'T': + if ( ! toptions(&curp, optarg)) + return((int)MANDOCLEVEL_BADARG); break; - case ('V'): + case 'W': + if ( ! woptions(&curp, optarg)) + return((int)MANDOCLEVEL_BADARG); + break; + case 'V': version(); /* NOTREACHED */ default: @@ -151,449 +144,262 @@ main(int argc, char *argv[]) /* NOTREACHED */ } + curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos); + + /* + * Conditionally start up the lookaside buffer before parsing. + */ + if (OUTT_MAN == curp.outtype) + mparse_keep(curp.mp); + argc -= optind; argv += optind; - bzero(&ln, sizeof(struct buf)); - bzero(&blk, sizeof(struct buf)); + rc = MANDOCLEVEL_OK; - rc = 1; + if (NULL == *argv) + parse(&curp, STDIN_FILENO, "", &rc); - if (NULL == *argv) { - curp.file = ""; - curp.fd = STDIN_FILENO; - - c = fdesc(&blk, &ln, &curp); - if ( ! (IGN_ERRORS & curp.fflags)) - rc = 1 == c ? 1 : 0; - else - rc = -1 == c ? 0 : 1; + while (*argv) { + parse(&curp, -1, *argv, &rc); + if (MANDOCLEVEL_OK != rc && curp.wstop) + break; + ++argv; } - while (rc && *argv) { - c = ffile(&blk, &ln, *argv, &curp); - if ( ! (IGN_ERRORS & curp.fflags)) - rc = 1 == c ? 1 : 0; - else - rc = -1 == c ? 0 : 1; - - argv++; - if (*argv && rc) { - if (curp.lastman) - if ( ! man_reset(curp.lastman)) - rc = 0; - if (curp.lastmdoc) - if ( ! mdoc_reset(curp.lastmdoc)) - rc = 0; - curp.lastman = NULL; - curp.lastmdoc = NULL; - } - } - - if (blk.buf) - free(blk.buf); - if (ln.buf) - free(ln.buf); if (curp.outfree) (*curp.outfree)(curp.outdata); - if (curp.mdoc) - mdoc_free(curp.mdoc); - if (curp.man) - man_free(curp.man); + if (curp.mp) + mparse_free(curp.mp); + free(defos); - 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] " + "[-Ios=name] " + "[-mformat] " + "[-Ooption] " + "[-Toutput] " + "[-Wlevel]\n" + "\t [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 = mwarn; - - /* Defaults from mandoc.1. */ - - pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS; - - if (curp->fflags & NO_IGN_MACRO) - pflags &= ~MAN_IGN_MACRO; - if (curp->fflags & NO_IGN_CHARS) - pflags &= ~MAN_IGN_CHARS; - if (curp->fflags & NO_IGN_ESCAPE) - pflags &= ~MAN_IGN_ESCAPE; - - 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_err = merr; - mdoccb.mdoc_warn = mwarn; + /* Begin by parsing the file itself. */ - /* Defaults from mandoc.1. */ + assert(file); + assert(fd >= -1); - pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS; + rc = mparse_readfd(curp->mp, fd, file); - if (curp->fflags & IGN_SCOPE) - pflags |= MDOC_IGN_SCOPE; - if (curp->fflags & NO_IGN_ESCAPE) - pflags &= ~MDOC_IGN_ESCAPE; - if (curp->fflags & NO_IGN_MACRO) - pflags &= ~MDOC_IGN_MACRO; - if (curp->fflags & NO_IGN_CHARS) - pflags &= ~MDOC_IGN_CHARS; + /* Stop immediately if the parse has failed. */ - if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb))) - warnx("memory exhausted"); + if (MANDOCLEVEL_FATAL <= rc) + goto cleanup; - return(mdoc); -} - - -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(-1); - } - - 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, comment; - 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)) - warn("%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(-1); - } - blk->sz = sz; - } + /* If unset, allocate output dev now (if applicable). */ - /* Fill buf with file blocksize. */ - - for (lnn = pos = comment = 0; ; ) { - if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { - warn("%s", curp->file); - return(-1); - } 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; - - /* 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(-1); - } - } - - if ('\n' != blk->buf[i]) { - if (comment) - continue; - ln->buf[pos++] = blk->buf[i]; - - /* Handle in-line `\"' comments. */ - - if (1 == pos || '\"' != ln->buf[pos - 1]) - continue; - - for (j = pos - 2; j >= 0; j--) - if ('\\' != ln->buf[j]) - break; - - if ( ! ((pos - 2 - j) % 2)) - continue; - - comment = 1; - pos -= 2; - continue; - } - - /* Handle escaped `\\n' newlines. */ - - if (pos > 0 && 0 == comment && - '\\' == 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 unset, assign parser in pset(). */ - - if ( ! (man || mdoc) && ! pset(ln->buf, - pos, curp, &man, &mdoc)) - return(-1); - - pos = comment = 0; - - /* Pass down into parsers. */ - - if (man && ! man_parseln(man, lnn, ln->buf)) - return(0); - if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf)) - return(0); + 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; } - } - /* NOTE a parser may not have been assigned, yet. */ - - if ( ! (man || mdoc)) { - warnx("%s: not a manual", curp->file); - return(0); - } - - if (mdoc && ! mdoc_endparse(mdoc)) - return(0); - if (man && ! man_endparse(man)) - return(0); - - /* If unset, allocate output dev now (if applicable). */ - - if ( ! (curp->outman && curp->outmdoc)) { switch (curp->outtype) { - case (OUTT_TREE): + 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_LINT): + case OUTT_MAN: + curp->outmdoc = man_mdoc; + curp->outman = man_man; break; - default: - curp->outdata = ascii_alloc(); + 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; - curp->outfree = terminal_free; break; + default: + break; } } + mparse_result(curp->mp, &mdoc, &man, NULL); + /* Execute the out device, if it exists. */ if (man && curp->outman) - if ( ! (*curp->outman)(curp->outdata, man)) - return(-1); + (*curp->outman)(curp->outdata, man); if (mdoc && curp->outmdoc) - if ( ! (*curp->outmdoc)(curp->outdata, mdoc)) - return(-1); + (*curp->outmdoc)(curp->outdata, mdoc); - return(1); -} + cleanup: + mparse_reset(curp->mp); -static int -pset(const char *buf, int pos, struct curparse *curp, - struct man **man, struct mdoc **mdoc) -{ - int i; - - /* - * 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 dot-lines, use -mdoc when finding `.Dt', or - * default to -man, which is more lenient. - */ - - if (buf[0] == '.') { - for (i = 1; buf[i]; i++) - if (' ' != buf[i] && '\t' != buf[i]) - break; - if (0 == buf[i]) - return(1); - } - - switch (curp->inttype) { - case (INTT_MDOC): - if (NULL == curp->mdoc) - curp->mdoc = mdoc_init(curp); - if (NULL == (*mdoc = curp->mdoc)) - return(0); - curp->lastmdoc = *mdoc; - return(1); - case (INTT_MAN): - if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) - return(0); - curp->lastman = *man; - 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); - curp->lastmdoc = *mdoc; - return(1); - } - - if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) - return(0); - curp->lastman = *man; - return(1); + if (*level < rc) + *level = rc; } - static int -moptions(enum intt *tflags, char *arg) +moptions(int *options, char *arg) { if (0 == strcmp(arg, "doc")) - *tflags = INTT_MDOC; + *options |= MPARSE_MDOC; else if (0 == strcmp(arg, "andoc")) - *tflags = INTT_AUTO; + /* nothing to do */; else if (0 == strcmp(arg, "an")) - *tflags = INTT_MAN; + *options |= MPARSE_MAN; else { - warnx("bad argument: -m%s", arg); + fprintf(stderr, "%s: -m%s: Bad argument\n", + progname, 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: -T%s: Bad argument\n", + progname, arg); return(0); } return(1); } - static int -foptions(int *fflags, char *arg) +woptions(struct curparse *curp, char *arg) { char *v, *o; - char *toks[7]; + const char *toks[6]; - toks[0] = "ign-scope"; - toks[1] = "no-ign-escape"; - toks[2] = "no-ign-macro"; - toks[3] = "no-ign-chars"; - toks[4] = "ign-errors"; - toks[5] = "strict"; - toks[6] = NULL; + toks[0] = "stop"; + toks[1] = "all"; + toks[2] = "warning"; + toks[3] = "error"; + toks[4] = "fatal"; + toks[5] = NULL; while (*arg) { o = arg; - switch (getsubopt(&arg, toks, &v)) { - case (0): - *fflags |= IGN_SCOPE; + switch (getsubopt(&arg, UNCONST(toks), &v)) { + case 0: + curp->wstop = 1; break; - case (1): - *fflags |= NO_IGN_ESCAPE; + case 1: + /* FALLTHROUGH */ + case 2: + curp->wlevel = MANDOCLEVEL_WARNING; break; - case (2): - *fflags |= NO_IGN_MACRO; + case 3: + curp->wlevel = MANDOCLEVEL_ERROR; break; - case (3): - *fflags |= NO_IGN_CHARS; + case 4: + curp->wlevel = MANDOCLEVEL_FATAL; break; - case (4): - *fflags |= IGN_ERRORS; - break; - case (5): - *fflags |= NO_IGN_ESCAPE | - NO_IGN_MACRO | NO_IGN_CHARS; - break; default: - warnx("bad argument: -f%s", o); + fprintf(stderr, "%s: -W%s: Bad argument\n", + progname, o); return(0); } } @@ -601,68 +407,24 @@ foptions(int *fflags, char *arg) return(1); } - -static int -woptions(int *wflags, char *arg) +static void +mmsg(enum mandocerr t, enum mandoclevel lvl, + const char *file, int line, int col, const char *msg) { - char *v, *o; - char *toks[3]; + const char *mparse_msg; - toks[0] = "all"; - toks[1] = "error"; - toks[2] = NULL; + fprintf(stderr, "%s: %s:", progname, file); - while (*arg) { - o = arg; - switch (getsubopt(&arg, toks, &v)) { - case (0): - *wflags |= WARN_WALL; - break; - case (1): - *wflags |= WARN_WERR; - break; - default: - warnx("bad argument: -W%s", o); - return(0); - } - } + if (line) + fprintf(stderr, "%d:%d:", line, col + 1); - return(1); -} + fprintf(stderr, " %s", mparse_strlevel(lvl)); + if (NULL != (mparse_msg = mparse_strerror(t))) + fprintf(stderr, ": %s", mparse_msg); -/* ARGSUSED */ -static int -merr(void *arg, int line, int col, const char *msg) -{ - struct curparse *curp; + if (msg) + fprintf(stderr, ": %s", msg); - curp = (struct curparse *)arg; - - warnx("%s:%d: error: %s (column %d)", - curp->file, line, msg, col); - - return(0); + fputc('\n', stderr); } - - -static int -mwarn(void *arg, int line, int col, const char *msg) -{ - struct curparse *curp; - - curp = (struct curparse *)arg; - - if ( ! (curp->wflags & WARN_WALL)) - return(1); - - warnx("%s:%d: warning: %s (column %d)", - curp->file, line, msg, col); - - if ( ! (curp->wflags & WARN_WERR)) - return(1); - - warnx("considering warnings as errors"); - return(0); -} -