=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.47 retrieving revision 1.103 diff -u -p -r1.47 -r1.103 --- mandoc/main.c 2009/10/26 04:15:42 1.47 +++ mandoc/main.c 2010/08/20 01:02:07 1.103 @@ -1,6 +1,7 @@ -/* $Id: main.c,v 1.47 2009/10/26 04:15:42 kristaps Exp $ */ +/* $Id: main.c,v 1.103 2010/08/20 01:02:07 schwarze Exp $ */ /* - * Copyright (c) 2008, 2009 Kristaps Dzonsons + * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons + * Copyright (c) 2010 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 @@ -14,10 +15,15 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#include #include #include -#include +#include #include #include #include @@ -25,24 +31,25 @@ #include #include +#include "mandoc.h" +#include "main.h" #include "mdoc.h" #include "man.h" -#include "main.h" +#include "roff.h" +#ifndef MAP_FILE +#define MAP_FILE 0 +#endif + #define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) -/* Account for FreeBSD and Linux in our declarations. */ +/* FIXME: Intel's compiler? LLVM? pcc? */ -#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 void (*out_mdoc)(void *, const struct mdoc *); typedef void (*out_man)(void *, const struct man *); @@ -63,87 +70,180 @@ enum outt { OUTT_ASCII = 0, OUTT_TREE, OUTT_HTML, - OUTT_LINT + OUTT_XHTML, + OUTT_LINT, + OUTT_PS, + OUTT_PDF }; 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; - char *outopts; + enum mandoclevel wlevel; /* Ignore messages below this. */ + int wstop; /* Stop after a file with a warning. */ + enum intt inttype; /* which parser to use */ + struct man *man; /* man parser */ + struct mdoc *mdoc; /* mdoc parser */ + struct roff *roff; /* roff parser (!NULL) */ + struct regset regs; /* roff registers */ + 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 */ }; -static int foptions(int *, char *); -static int toptions(enum outt *, char *); +static const char * const mandoclevels[MANDOCLEVEL_MAX] = { + "SUCCESS", + "RESERVED", + "WARNING", + "ERROR", + "FATAL", + "BADARG", + "SYSERR" +}; + +static const enum mandocerr mandoclimits[MANDOCLEVEL_MAX] = { + MANDOCERR_OK, + MANDOCERR_WARNING, + MANDOCERR_WARNING, + MANDOCERR_ERROR, + MANDOCERR_FATAL, + MANDOCERR_MAX, + MANDOCERR_MAX +}; + +static const char * const mandocerrs[MANDOCERR_MAX] = { + "ok", + + "generic warning", + + "text should be uppercase", + "sections out of conventional order", + "section name repeats", + "out of order prologue", + "repeated prologue entry", + "list type must come first", + "bad standard", + "bad library", + "tab in non-literal context", + "bad escape sequence", + "unterminated quoted string", + "argument requires the width argument", + "superfluous width argument", + "ignoring argument", + "bad date argument", + "bad width argument", + "unknown manual section", + "section not in conventional manual section", + "end of line whitespace", + "blocks badly nested", + "scope open on exit", + + "generic error", + + "NAME section must come first", + "bad Boolean value", + "child violates parent syntax", + "bad AT&T symbol", + "list type repeated", + "display type repeated", + "argument repeated", + "manual name not yet set", + "obsolete macro ignored", + "empty macro ignored", + "macro not allowed in body", + "macro not allowed in prologue", + "bad character", + "bad NAME section contents", + "no blank lines", + "no text in this context", + "bad comment style", + "unknown macro will be lost", + "line scope broken", + "argument count wrong", + "request scope close w/none open", + "scope already open", + "macro requires line argument(s)", + "macro requires body argument(s)", + "macro requires argument(s)", + "no title in document", + "missing list type", + "missing display type", + "missing font type", + "line argument(s) will be lost", + "body argument(s) will be lost", + + "generic fatal error", + + "column syntax is inconsistent", + "displays may not be nested", + "unsupported display type", + "blocks badly nested", + "no such block is open", + "scope broken, syntax violated", + "line scope broken, syntax violated", + "argument count wrong, violates syntax", + "child violates parent syntax", + "argument count wrong, violates syntax", + "no document body", + "no document prologue", + "utsname system call failed", + "static buffer exhausted", +}; + +static void fdesc(struct curparse *); +static void ffile(const char *, struct curparse *); 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 *, +static int mmsg(enum mandocerr, void *, + int, int, const char *); +static void 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 int toptions(struct curparse *, char *); +static void usage(void) __attribute__((noreturn)); +static void version(void) __attribute__((noreturn)); +static int woptions(struct curparse *, char *); -extern char *__progname; +static const char *progname; +static enum mandoclevel exit_status = MANDOCLEVEL_OK; - int main(int argc, char *argv[]) { - int c, rc; - struct buf ln, blk; + int c; struct curparse curp; - bzero(&curp, sizeof(struct curparse)); + progname = strrchr(argv[0], '/'); + if (progname == NULL) + progname = argv[0]; + else + ++progname; + memset(&curp, 0, sizeof(struct curparse)); + curp.inttype = INTT_AUTO; curp.outtype = OUTT_ASCII; + curp.wlevel = MANDOCLEVEL_FATAL; /* LINTED */ - while (-1 != (c = getopt(argc, argv, "f:m:O:T:VW:"))) + while (-1 != (c = getopt(argc, argv, "m:O:T:VW:"))) switch (c) { - case ('f'): - if ( ! foptions(&curp.fflags, optarg)) - return(EXIT_FAILURE); - break; case ('m'): if ( ! moptions(&curp.inttype, optarg)) - return(EXIT_FAILURE); + return(MANDOCLEVEL_BADARG); break; - case ('o'): - curp.outopts = optarg; + case ('O'): + (void)strlcat(curp.outopts, optarg, BUFSIZ); + (void)strlcat(curp.outopts, ",", BUFSIZ); break; case ('T'): - if ( ! toptions(&curp.outtype, optarg)) - return(EXIT_FAILURE); + if ( ! toptions(&curp, optarg)) + return(MANDOCLEVEL_BADARG); break; case ('W'): - if ( ! woptions(&curp.wflags, optarg)) - return(EXIT_FAILURE); + if ( ! woptions(&curp, optarg)) + return(MANDOCLEVEL_BADARG); break; case ('V'): version(); @@ -156,286 +256,362 @@ main(int argc, char *argv[]) argc -= optind; argv += optind; - bzero(&ln, sizeof(struct buf)); - bzero(&blk, sizeof(struct buf)); - - rc = 1; - 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; + fdesc(&curp); } - 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; - } + while (*argv) { + ffile(*argv, &curp); + if (MANDOCLEVEL_OK != exit_status && curp.wstop) + break; + ++argv; } - 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.roff) + roff_free(curp.roff); - return(rc ? EXIT_SUCCESS : EXIT_FAILURE); + return(exit_status); } -__dead static void +static void version(void) { - (void)printf("%s %s\n", __progname, VERSION); - exit(EXIT_SUCCESS); + (void)printf("%s %s\n", progname, VERSION); + exit(MANDOCLEVEL_OK); } -__dead static void +static void usage(void) { - (void)fprintf(stderr, "usage: %s [-V] [-foption...] " - "[-mformat] [-Toutput] [-Werr...]\n", - __progname); - exit(EXIT_FAILURE); + (void)fprintf(stderr, "usage: %s [-V] [-foption] " + "[-mformat] [-Ooption] [-Toutput] " + "[-Werr] [file...]\n", progname); + exit(MANDOCLEVEL_BADARG); } -static struct man * -man_init(struct curparse *curp) +static void +ffile(const char *file, struct curparse *curp) { - int pflags; - struct man *man; - struct man_cb mancb; - mancb.man_err = merr; - mancb.man_warn = mwarn; + curp->file = file; + if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { + perror(curp->file); + exit_status = MANDOCLEVEL_SYSERR; + return; + } - /* Defaults from mandoc.1. */ + fdesc(curp); - 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); + if (-1 == close(curp->fd)) + perror(curp->file); } -static struct mdoc * -mdoc_init(struct curparse *curp) +static void +resize_buf(struct buf *buf, size_t initial) { - int pflags; - struct mdoc *mdoc; - struct mdoc_cb mdoccb; - mdoccb.mdoc_err = merr; - mdoccb.mdoc_warn = mwarn; - - /* Defaults from mandoc.1. */ - - pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS; - - 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; - - if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb))) - warnx("memory exhausted"); - - return(mdoc); + buf->sz = buf->sz ? 2 * buf->sz : initial; + buf->buf = realloc(buf->buf, buf->sz); + if (NULL == buf->buf) { + perror(NULL); + exit(MANDOCLEVEL_SYSERR); + } } static int -ffile(struct buf *blk, struct buf *ln, - const char *file, struct curparse *curp) +read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap) { - int c; + struct stat st; + size_t off; + ssize_t ssz; - curp->file = file; - if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { - warn("%s", curp->file); - return(-1); + if (-1 == fstat(curp->fd, &st)) { + perror(curp->file); + return(0); } - c = fdesc(blk, ln, curp); + /* + * If we're a regular file, try just reading in the whole entry + * via mmap(). This is faster than reading it into blocks, and + * since each file is only a few bytes to begin with, I'm not + * concerned that this is going to tank any machines. + */ - if (-1 == close(curp->fd)) - warn("%s", curp->file); + if (S_ISREG(st.st_mode)) { + if (st.st_size >= (1U << 31)) { + fprintf(stderr, "%s: input too large\n", + curp->file); + return(0); + } + *with_mmap = 1; + fb->sz = (size_t)st.st_size; + fb->buf = mmap(NULL, fb->sz, PROT_READ, + MAP_FILE|MAP_SHARED, curp->fd, 0); + if (fb->buf != MAP_FAILED) + return(1); + } - return(c); + /* + * If this isn't a regular file (like, say, stdin), then we must + * go the old way and just read things in bit by bit. + */ + + *with_mmap = 0; + off = 0; + fb->sz = 0; + fb->buf = NULL; + for (;;) { + if (off == fb->sz) { + if (fb->sz == (1U << 31)) { + fprintf(stderr, "%s: input too large\n", + curp->file); + break; + } + resize_buf(fb, 65536); + } + ssz = read(curp->fd, fb->buf + (int)off, fb->sz - off); + if (ssz == 0) { + fb->sz = off; + return(1); + } + if (ssz == -1) { + perror(curp->file); + break; + } + off += (size_t)ssz; + } + + free(fb->buf); + fb->buf = NULL; + return(0); } -static int -fdesc(struct buf *blk, struct buf *ln, struct curparse *curp) +static void +fdesc(struct curparse *curp) { - size_t sz; - ssize_t ssz; - struct stat st; - int j, i, pos, lnn, comment; + struct buf ln, blk; + int i, pos, lnn, lnn_start, with_mmap, of; + enum rofferr re; + unsigned char c; struct man *man; struct mdoc *mdoc; + struct roff *roff; - sz = BUFSIZ; man = NULL; mdoc = NULL; + roff = NULL; + memset(&ln, 0, sizeof(struct buf)); + /* - * 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. + * Two buffers: ln and buf. buf is the input file and may be + * memory mapped. ln is a line buffer and grows on-demand. */ - if (-1 == fstat(curp->fd, &st)) - warn("%s", curp->file); - else if ((size_t)st.st_blksize > sz) - sz = st.st_blksize; - - if (sz > blk->sz) { - blk->buf = realloc(blk->buf, sz); - if (NULL == blk->buf) { - warn("realloc"); - return(-1); - } - blk->sz = sz; + if ( ! read_whole_file(curp, &blk, &with_mmap)) { + exit_status = MANDOCLEVEL_SYSERR; + return; } - /* Fill buf with file blocksize. */ + if (NULL == curp->roff) + curp->roff = roff_alloc(&curp->regs, curp, mmsg); + assert(curp->roff); + roff = curp->roff; - for (lnn = pos = comment = 0; ; ) { - if (-1 == (ssz = read(curp->fd, blk->buf, sz))) { - warn("%s", curp->file); - return(-1); - } else if (0 == ssz) - 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); - } + for (i = 0, lnn = 1; i < (int)blk.sz;) { + pos = 0; + lnn_start = lnn; + while (i < (int)blk.sz) { + if ('\n' == blk.buf[i]) { + ++i; + ++lnn; + break; } - if ('\n' != blk->buf[i]) { - if (comment) - continue; - ln->buf[pos++] = blk->buf[i]; + /* + * Warn about bogus characters. If you're using + * non-ASCII encoding, you're screwing your + * readers. Since I'd rather this not happen, + * I'll be helpful and drop these characters so + * we don't display gibberish. Note to manual + * writers: use special characters. + */ - /* 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; + c = (unsigned char) blk.buf[i]; + if ( ! (isascii(c) && (isgraph(c) || isblank(c)))) { + mmsg(MANDOCERR_BADCHAR, curp, + lnn_start, pos, "ignoring byte"); + i++; 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]) + /* Trailing backslash is like a plain character. */ + if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) { + if (pos >= (int)ln.sz) + resize_buf(&ln, 256); + ln.buf[pos++] = blk.buf[i++]; + continue; + } + /* Found an escape and at least one other character. */ + if ('\n' == blk.buf[i + 1]) { + /* Escaped newlines are skipped over */ + i += 2; + ++lnn; + continue; + } + if ('"' == blk.buf[i + 1]) { + i += 2; + /* Comment, skip to end of line */ + for (; i < (int)blk.sz; ++i) { + if ('\n' == blk.buf[i]) { + ++i; + ++lnn; break; - if ( ! ((pos - j) % 2)) { - pos--; - lnn++; - continue; + } } + /* Backout trailing whitespaces */ + for (; pos > 0; --pos) { + if (ln.buf[pos - 1] != ' ') + break; + if (pos > 2 && ln.buf[pos - 2] == '\\') + break; + } + break; } + /* Some other escape sequence, copy and continue. */ + if (pos + 1 >= (int)ln.sz) + resize_buf(&ln, 256); - ln->buf[pos] = 0; - lnn++; + ln.buf[pos++] = blk.buf[i++]; + ln.buf[pos++] = blk.buf[i++]; + } - /* If unset, assign parser in pset(). */ + if (pos >= (int)ln.sz) + resize_buf(&ln, 256); + ln.buf[pos] = '\0'; - if ( ! (man || mdoc) && ! pset(ln->buf, - pos, curp, &man, &mdoc)) - return(-1); + /* + * A significant amount of complexity is contained by + * the roff preprocessor. It's line-oriented but can be + * expressed on one line, so we need at times to + * readjust our starting point and re-run it. The roff + * preprocessor can also readjust the buffers with new + * data, so we pass them in wholesale. + */ - pos = comment = 0; + of = 0; + do { + re = roff_parseln(roff, lnn_start, + &ln.buf, &ln.sz, of, &of); + } while (ROFF_RERUN == re); - /* Pass down into parsers. */ + if (ROFF_IGN == re) { + continue; + } else if (ROFF_ERR == re) { + assert(MANDOCLEVEL_FATAL <= exit_status); + goto cleanup; + } - if (man && ! man_parseln(man, lnn, ln->buf)) - return(0); - if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf)) - return(0); + /* + * If input parsers have not been allocated, do so now. + * We keep these instanced betwen parsers, but set them + * locally per parse routine since we can use different + * parsers with each one. + */ + + if ( ! (man || mdoc)) + pset(ln.buf + of, pos - of, curp, &man, &mdoc); + + /* Lastly, push down into the parsers themselves. */ + + if (man && ! man_parseln(man, lnn_start, ln.buf, of)) { + assert(MANDOCLEVEL_FATAL <= exit_status); + goto cleanup; } + if (mdoc && ! mdoc_parseln(mdoc, lnn_start, ln.buf, of)) { + assert(MANDOCLEVEL_FATAL <= exit_status); + goto cleanup; + } } + /* + * With -Wstop and warnings or errors of at least + * the requested level, do not produce output. + */ + + if (MANDOCLEVEL_OK != exit_status && curp->wstop) + goto cleanup; + /* NOTE a parser may not have been assigned, yet. */ if ( ! (man || mdoc)) { - (void)fprintf(stderr, "%s: not a manual\n", - curp->file); - return(0); + fprintf(stderr, "%s: Not a manual\n", curp->file); + exit_status = MANDOCLEVEL_FATAL; + goto cleanup; } - if (mdoc && ! mdoc_endparse(mdoc)) - return(0); - if (man && ! man_endparse(man)) - return(0); + /* Clean up the parse routine ASTs. */ + if (mdoc && ! mdoc_endparse(mdoc)) { + assert(MANDOCLEVEL_FATAL <= exit_status); + goto cleanup; + } + if (man && ! man_endparse(man)) { + assert(MANDOCLEVEL_FATAL <= exit_status); + goto cleanup; + } + if (roff && ! roff_endparse(roff)) { + assert(MANDOCLEVEL_FATAL <= exit_status); + goto cleanup; + } + /* If unset, allocate output dev now (if applicable). */ if ( ! (curp->outman && curp->outmdoc)) { switch (curp->outtype) { + case (OUTT_XHTML): + curp->outdata = xhtml_alloc(curp->outopts); + break; case (OUTT_HTML): curp->outdata = html_alloc(curp->outopts); + 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; + } + + switch (curp->outtype) { + case (OUTT_HTML): + /* FALLTHROUGH */ + case (OUTT_XHTML): curp->outman = html_man; curp->outmdoc = html_mdoc; curp->outfree = html_free; @@ -444,14 +620,16 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse curp->outman = tree_man; curp->outmdoc = tree_mdoc; break; - case (OUTT_LINT): - break; - default: - curp->outdata = ascii_alloc(); + case (OUTT_PDF): + /* FALLTHROUGH */ + case (OUTT_ASCII): + /* FALLTHROUGH */ + case (OUTT_PS): curp->outman = terminal_man; curp->outmdoc = terminal_mdoc; - curp->outfree = terminal_free; break; + default: + break; } } @@ -462,11 +640,26 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse if (mdoc && curp->outmdoc) (*curp->outmdoc)(curp->outdata, mdoc); - return(1); + cleanup: + memset(&curp->regs, 0, sizeof(struct regset)); + if (mdoc) + mdoc_reset(mdoc); + if (man) + man_reset(man); + if (roff) + roff_reset(roff); + if (ln.buf) + free(ln.buf); + if (with_mmap) + munmap(blk.buf, blk.sz); + else + free(blk.buf); + + return; } -static int +static void pset(const char *buf, int pos, struct curparse *curp, struct man **man, struct mdoc **mdoc) { @@ -480,48 +673,43 @@ pset(const char *buf, int pos, struct curparse *curp, * default to -man, which is more lenient. */ - if (buf[0] == '.') { + if ('.' == buf[0] || '\'' == buf[0]) { for (i = 1; buf[i]; i++) if (' ' != buf[i] && '\t' != buf[i]) break; - if (0 == buf[i]) - return(1); + if ('\0' == buf[i]) + return; } 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); + curp->mdoc = mdoc_alloc(&curp->regs, curp, mmsg); + assert(curp->mdoc); + *mdoc = curp->mdoc; + return; case (INTT_MAN): if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) - return(0); - curp->lastman = *man; - return(1); + curp->man = man_alloc(&curp->regs, curp, mmsg); + assert(curp->man); + *man = curp->man; + return; 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); + curp->mdoc = mdoc_alloc(&curp->regs, curp, mmsg); + assert(curp->mdoc); + *mdoc = curp->mdoc; + return; } if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) - return(0); - curp->lastman = *man; - return(1); + curp->man = man_alloc(&curp->regs, curp, mmsg); + assert(curp->man); + *man = curp->man; } @@ -536,7 +724,7 @@ moptions(enum intt *tflags, char *arg) else if (0 == strcmp(arg, "an")) *tflags = INTT_MAN; else { - warnx("bad argument: -m%s", arg); + fprintf(stderr, "%s: Bad argument\n", arg); return(0); } @@ -545,19 +733,27 @@ moptions(enum intt *tflags, char *arg) 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; + curp->outtype = OUTT_ASCII; + else if (0 == strcmp(arg, "lint")) { + curp->outtype = OUTT_LINT; + curp->wlevel = MANDOCLEVEL_WARNING; + } else if (0 == strcmp(arg, "tree")) - *tflags = OUTT_TREE; + curp->outtype = OUTT_TREE; else if (0 == strcmp(arg, "html")) - *tflags = OUTT_HTML; + curp->outtype = OUTT_HTML; + 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); } @@ -566,43 +762,37 @@ toptions(enum outt *tflags, char *arg) static int -foptions(int *fflags, char *arg) +woptions(struct curparse *curp, char *arg) { char *v, *o; - const 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, UNCONST(toks), &v)) { case (0): - *fflags |= IGN_SCOPE; + curp->wstop = 1; break; case (1): - *fflags |= NO_IGN_ESCAPE; - break; + /* FALLTHROUGH */ case (2): - *fflags |= NO_IGN_MACRO; + curp->wlevel = MANDOCLEVEL_WARNING; break; case (3): - *fflags |= NO_IGN_CHARS; + curp->wlevel = MANDOCLEVEL_ERROR; break; case (4): - *fflags |= IGN_ERRORS; + curp->wlevel = MANDOCLEVEL_FATAL; break; - case (5): - *fflags |= NO_IGN_ESCAPE | - NO_IGN_MACRO | NO_IGN_CHARS; - break; default: - warnx("bad argument: -f%s", o); + fprintf(stderr, "-W%s: Bad argument\n", o); return(0); } } @@ -612,65 +802,27 @@ foptions(int *fflags, char *arg) static int -woptions(int *wflags, char *arg) +mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg) { - char *v, *o; - const char *toks[3]; + struct curparse *cp; + enum mandoclevel level; - toks[0] = "all"; - toks[1] = "error"; - toks[2] = NULL; + level = MANDOCLEVEL_FATAL; + while (t < mandoclimits[level]) + level--; - while (*arg) { - o = arg; - switch (getsubopt(&arg, UNCONST(toks), &v)) { - case (0): - *wflags |= WARN_WALL; - break; - case (1): - *wflags |= WARN_WERR; - break; - default: - warnx("bad argument: -W%s", o); - return(0); - } - } - - return(1); -} - - -/* ARGSUSED */ -static int -merr(void *arg, int line, int col, const char *msg) -{ - struct curparse *curp; - - curp = (struct curparse *)arg; - - (void)fprintf(stderr, "%s:%d:%d: error: %s\n", - curp->file, line, col + 1, msg); - - return(0); -} - - -static int -mwarn(void *arg, int line, int col, const char *msg) -{ - struct curparse *curp; - - curp = (struct curparse *)arg; - - if ( ! (curp->wflags & WARN_WALL)) + cp = (struct curparse *)arg; + if (level < cp->wlevel) return(1); - (void)fprintf(stderr, "%s:%d:%d: warning: %s\n", - curp->file, line, col + 1, msg); + fprintf(stderr, "%s:%d:%d: %s: %s", + cp->file, ln, col + 1, mandoclevels[level], mandocerrs[t]); + if (msg) + fprintf(stderr, ": %s", msg); + fputc('\n', stderr); - if ( ! (curp->wflags & WARN_WERR)) - return(1); + if (exit_status < level) + exit_status = level; - return(0); + return(level < MANDOCLEVEL_FATAL); } -