=================================================================== RCS file: /cvs/mandoc/main.c,v retrieving revision 1.69 retrieving revision 1.129 diff -u -p -r1.69 -r1.129 --- mandoc/main.c 2010/05/15 16:18:23 1.69 +++ mandoc/main.c 2011/01/01 15:45:18 1.129 @@ -1,6 +1,7 @@ -/* $Id: main.c,v 1.69 2010/05/15 16:18:23 joerg Exp $ */ +/* $Id: main.c,v 1.129 2011/01/01 15:45:18 kristaps 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 @@ -22,6 +23,7 @@ #include #include +#include #include #include #include @@ -29,10 +31,17 @@ #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 REPARSE_LIMIT 1000 #define UNCONST(a) ((void *)(uintptr_t)(const void *)(a)) /* FIXME: Intel's compiler? LLVM? pcc? */ @@ -63,51 +72,167 @@ enum outt { OUTT_TREE, OUTT_HTML, OUTT_XHTML, - OUTT_LINT + 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 FL_IGN_SCOPE (1 << 0) /* Ignore scope errors. */ -#define FL_NIGN_ESCAPE (1 << 1) /* Don't ignore bad escapes. */ -#define FL_NIGN_MACRO (1 << 2) /* Don't ignore bad macros. */ -#define FL_IGN_ERRORS (1 << 4) /* Ignore failed parse. */ -#define FL_STRICT FL_NIGN_ESCAPE | \ - FL_NIGN_MACRO - enum intt inttype; /* Input parsers... */ - struct man *man; - struct mdoc *mdoc; - enum outt outtype; /* Output devices... */ - out_mdoc outmdoc; - out_man outman; - out_free outfree; - void *outdata; - char outopts[BUFSIZ]; + int line; /* Line number in the file. */ + 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 *pman; /* persistent man parser */ + struct mdoc *pmdoc; /* persistent mdoc parser */ + struct man *man; /* man parser */ + struct mdoc *mdoc; /* mdoc parser */ + struct roff *roff; /* roff parser (!NULL) */ + struct regset regs; /* roff registers */ + int reparse_count; /* finite interpolation stack */ + 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 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", + + /* related to the prologue */ + "no title in document", + "document title should be all caps", + "unknown manual section", + "cannot parse date argument", + "prologue macros out of order", + "duplicate prologue macro", + "macro not allowed in prologue", + "macro not allowed in body", + + /* related to document structure */ + ".so is fragile, better use ln(1)", + "NAME section must come first", + "bad NAME section contents", + "manual name not yet set", + "sections out of conventional order", + "duplicate section name", + "section not in conventional manual section", + + /* related to macros and nesting */ + "skipping obsolete macro", + "skipping paragraph macro", + "blocks badly nested", + "child violates parent syntax", + "nested displays are not portable", + "already in literal mode", + + /* related to missing macro arguments */ + "skipping empty macro", + "missing display type", + "list type must come first", + "tag lists require a width argument", + "missing font type", + + /* related to bad macro arguments */ + "skipping argument", + "duplicate argument", + "duplicate display type", + "duplicate list type", + "unknown AT&T UNIX version", + "bad Boolean value", + "unknown font", + "unknown standard specifier", + "bad width argument", + + /* related to plain text */ + "blank line in non-literal context", + "tab in non-literal context", + "end of line whitespace", + "bad comment style", + "unknown escape sequence", + "unterminated quoted string", + + "generic error", + + "bad table syntax", + "bad table option", + "bad table layout", + "no table layout cells specified", + "no table data cells specified", + "input stack limit exceeded, infinite loop?", + "skipping bad character", + "skipping text before the first section header", + "skipping unknown macro", + "NOT IMPLEMENTED: skipping request", + "line scope broken", + "argument count wrong", + "skipping end of block that is not open", + "missing end of block", + "scope open on exit", + "uname(3) system call failed", + "macro requires line argument(s)", + "macro requires body argument(s)", + "macro requires argument(s)", + "missing list type", + "line argument(s) will be lost", + "body argument(s) will be lost", + + "generic fatal error", + + "column syntax is inconsistent", + "NOT IMPLEMENTED: .Bd -file", + "line scope broken, syntax violated", + "argument count wrong, violates syntax", + "child violates parent syntax", + "argument count wrong, violates syntax", + "NOT IMPLEMENTED: .so with absolute path or \"..\"", + "no document body", + "no document prologue", + "static buffer exhausted", +}; + +static void parsebuf(struct curparse *, struct buf, int); +static void pdesc(struct curparse *); static void fdesc(struct curparse *); static void ffile(const char *, struct curparse *); -static int foptions(int *, char *); -static struct man *man_init(struct curparse *); -static struct mdoc *mdoc_init(struct curparse *); -static int merr(void *, int, int, const char *); +static int pfile(const char *, struct curparse *); static int moptions(enum intt *, char *); -static int mwarn(void *, int, int, const char *); -static int pset(const char *, int, struct curparse *, - struct man **, struct mdoc **); +static int mmsg(enum mandocerr, void *, + int, int, const char *); +static void pset(const char *, int, struct curparse *); static int toptions(struct curparse *, char *); static void usage(void) __attribute__((noreturn)); static void version(void) __attribute__((noreturn)); -static int woptions(int *, char *); +static int woptions(struct curparse *, char *); static const char *progname; -static int with_error; -static int with_warning; +static enum mandoclevel file_status = MANDOCLEVEL_OK; +static enum mandoclevel exit_status = MANDOCLEVEL_OK; int main(int argc, char *argv[]) @@ -125,17 +250,14 @@ main(int argc, char *argv[]) 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((int)MANDOCLEVEL_BADARG); break; case ('O'): (void)strlcat(curp.outopts, optarg, BUFSIZ); @@ -143,11 +265,11 @@ main(int argc, char *argv[]) break; case ('T'): if ( ! toptions(&curp, optarg)) - return(EXIT_FAILURE); + return((int)MANDOCLEVEL_BADARG); break; case ('W'): - if ( ! woptions(&curp.wflags, optarg)) - return(EXIT_FAILURE); + if ( ! woptions(&curp, optarg)) + return((int)MANDOCLEVEL_BADARG); break; case ('V'): version(); @@ -169,17 +291,21 @@ main(int argc, char *argv[]) while (*argv) { ffile(*argv, &curp); - - if (with_error && !(curp.fflags & FL_IGN_ERRORS)) + if (MANDOCLEVEL_OK != exit_status && curp.wstop) break; ++argv; } if (curp.outfree) (*curp.outfree)(curp.outdata); + if (curp.pmdoc) + mdoc_free(curp.pmdoc); + if (curp.pman) + man_free(curp.pman); + if (curp.roff) + roff_free(curp.roff); - return((with_warning || with_error) ? - EXIT_FAILURE : EXIT_SUCCESS); + return((int)exit_status); } @@ -188,7 +314,7 @@ version(void) { (void)printf("%s %s\n", progname, VERSION); - exit(EXIT_SUCCESS); + exit((int)MANDOCLEVEL_OK); } @@ -196,95 +322,84 @@ static void usage(void) { - (void)fprintf(stderr, "usage: %s [-V] [-foption] " - "[-mformat] [-Ooption] [-Toutput] " - "[-Werr] [file...]\n", progname); - exit(EXIT_FAILURE); + (void)fprintf(stderr, "usage: %s " + "[-V] " + "[-foption] " + "[-mformat] " + "[-Ooption] " + "[-Toutput] " + "[-Werr] " + "[file...]\n", + progname); + + exit((int)MANDOCLEVEL_BADARG); } - -static struct man * -man_init(struct curparse *curp) +static void +ffile(const char *file, struct curparse *curp) { - int pflags; - struct man_cb mancb; - mancb.man_err = merr; - mancb.man_warn = mwarn; + /* + * Called once per input file. Get the file ready for reading, + * pass it through to the parser-driver, then close it out. + * XXX: don't do anything special as this is only called for + * files; stdin goes directly to fdesc(). + */ - /* Defaults from mandoc.1. */ + curp->file = file; - pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE; + if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { + perror(curp->file); + exit_status = MANDOCLEVEL_SYSERR; + return; + } - if (curp->fflags & FL_NIGN_MACRO) - pflags &= ~MAN_IGN_MACRO; - if (curp->fflags & FL_NIGN_ESCAPE) - pflags &= ~MAN_IGN_ESCAPE; + fdesc(curp); - return(man_alloc(curp, pflags, &mancb)); + if (-1 == close(curp->fd)) + perror(curp->file); } - -static struct mdoc * -mdoc_init(struct curparse *curp) +static int +pfile(const char *file, struct curparse *curp) { - int pflags; - struct mdoc_cb mdoccb; + const char *savefile; + int fd, savefd; - mdoccb.mdoc_err = merr; - mdoccb.mdoc_warn = mwarn; + if (-1 == (fd = open(file, O_RDONLY, 0))) { + perror(file); + file_status = MANDOCLEVEL_SYSERR; + return(0); + } - /* Defaults from mandoc.1. */ + savefile = curp->file; + savefd = curp->fd; - pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE; + curp->file = file; + curp->fd = fd; - if (curp->fflags & FL_IGN_SCOPE) - pflags |= MDOC_IGN_SCOPE; - if (curp->fflags & FL_NIGN_ESCAPE) - pflags &= ~MDOC_IGN_ESCAPE; - if (curp->fflags & FL_NIGN_MACRO) - pflags &= ~MDOC_IGN_MACRO; + pdesc(curp); - return(mdoc_alloc(curp, pflags, &mdoccb)); -} + curp->file = savefile; + curp->fd = savefd; + if (-1 == close(fd)) + perror(file); -static void -ffile(const char *file, struct curparse *curp) -{ - - curp->file = file; - if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) { - perror(curp->file); - with_error = 1; - return; - } - - fdesc(curp); - - if (-1 == close(curp->fd)) - perror(curp->file); + return(MANDOCLEVEL_FATAL > file_status ? 1 : 0); } -static int +static void resize_buf(struct buf *buf, size_t initial) { - void *tmp; - size_t sz; - if (buf->sz == 0) - sz = initial; - else - sz = 2 * buf->sz; - tmp = realloc(buf->buf, sz); - if (NULL == tmp) { + buf->sz = buf->sz > initial/2 ? 2 * buf->sz : initial; + buf->buf = realloc(buf->buf, buf->sz); + if (NULL == buf->buf) { perror(NULL); - return(0); + exit((int)MANDOCLEVEL_SYSERR); } - buf->buf = tmp; - buf->sz = sz; - return(1); } @@ -297,7 +412,6 @@ read_whole_file(struct curparse *curp, struct buf *fb, if (-1 == fstat(curp->fd, &st)) { perror(curp->file); - with_error = 1; return(0); } @@ -312,13 +426,12 @@ read_whole_file(struct curparse *curp, struct buf *fb, if (st.st_size >= (1U << 31)) { fprintf(stderr, "%s: input too large\n", curp->file); - with_error = 1; return(0); } *with_mmap = 1; - fb->sz = st.st_size; + fb->sz = (size_t)st.st_size; fb->buf = mmap(NULL, fb->sz, PROT_READ, - MAP_FILE, curp->fd, 0); + MAP_FILE|MAP_SHARED, curp->fd, 0); if (fb->buf != MAP_FAILED) return(1); } @@ -339,10 +452,9 @@ read_whole_file(struct curparse *curp, struct buf *fb, curp->file); break; } - if (! resize_buf(fb, 65536)) - break; + resize_buf(fb, 65536); } - ssz = read(curp->fd, fb->buf + off, fb->sz - off); + ssz = read(curp->fd, fb->buf + (int)off, fb->sz - off); if (ssz == 0) { fb->sz = off; return(1); @@ -351,12 +463,11 @@ read_whole_file(struct curparse *curp, struct buf *fb, perror(curp->file); break; } - off += ssz; + off += (size_t)ssz; } free(fb->buf); fb->buf = NULL; - with_error = 1; return(0); } @@ -364,115 +475,101 @@ read_whole_file(struct curparse *curp, struct buf *fb, static void fdesc(struct curparse *curp) { - struct buf ln, blk; - int j, i, pos, lnn, comment, with_mmap; - struct man *man; - struct mdoc *mdoc; - man = NULL; - mdoc = 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. + * Called once per file with an opened file descriptor. All + * pre-file-parse operations (whether stdin or a file) should go + * here. + * + * This calls down into the nested parser, which drills down and + * fully parses a file and all its dependences (i.e., `so'). It + * then runs the cleanup validators and pushes to output. */ - if (!read_whole_file(curp, &blk, &with_mmap)) - return; + /* Zero the parse type. */ - /* Fill buf with file blocksize. */ + curp->mdoc = NULL; + curp->man = NULL; + file_status = MANDOCLEVEL_OK; - for (i = lnn = pos = comment = 0; i < (int)blk.sz; ++i) { - if (pos >= (int)ln.sz) { - if (! resize_buf(&ln, 256)) - goto bailout; - } + /* Make sure the mandotory roff parser is initialised. */ - if ('\n' != blk.buf[i]) { - if (comment) - continue; - ln.buf[pos++] = blk.buf[i]; + if (NULL == curp->roff) { + curp->roff = roff_alloc(&curp->regs, curp, mmsg); + assert(curp->roff); + } - /* Handle in-line `\"' comments. */ + /* Fully parse the file. */ - if (1 == pos || '\"' != ln.buf[pos - 1]) - continue; + pdesc(curp); - for (j = pos - 2; j >= 0; j--) - if ('\\' != ln.buf[j]) - break; + if (MANDOCLEVEL_FATAL <= file_status) + goto cleanup; - if ( ! ((pos - 2 - j) % 2)) - continue; + /* NOTE a parser may not have been assigned, yet. */ - comment = 1; - pos -= 2; - for (; pos > 0; --pos) { - if (ln.buf[pos - 1] != ' ') - break; - if (pos > 2 && ln.buf[pos - 2] == '\\') - break; - } - continue; - } + if ( ! (curp->man || curp->mdoc)) { + fprintf(stderr, "%s: Not a manual\n", curp->file); + file_status = MANDOCLEVEL_FATAL; + goto cleanup; + } - /* Handle escaped `\\n' newlines. */ + /* Clean up the parse routine ASTs. */ - 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; - } - } + if (curp->mdoc && ! mdoc_endparse(curp->mdoc)) { + assert(MANDOCLEVEL_FATAL <= file_status); + goto cleanup; + } - ln.buf[pos] = 0; - lnn++; - - /* If unset, assign parser in pset(). */ - - if ( ! (man || mdoc) && ! pset(ln.buf, pos, curp, &man, &mdoc)) - goto bailout; - - pos = comment = 0; - - /* Pass down into parsers. */ - - if (man && ! man_parseln(man, lnn, ln.buf)) - goto bailout; - if (mdoc && ! mdoc_parseln(mdoc, lnn, ln.buf)) - goto bailout; + if (curp->man && ! man_endparse(curp->man)) { + assert(MANDOCLEVEL_FATAL <= file_status); + goto cleanup; } - /* NOTE a parser may not have been assigned, yet. */ - - if ( ! (man || mdoc)) { - fprintf(stderr, "%s: Not a manual\n", curp->file); - goto bailout; + assert(curp->roff); + if ( ! roff_endparse(curp->roff)) { + assert(MANDOCLEVEL_FATAL <= file_status); + goto cleanup; } - if (mdoc && ! mdoc_endparse(mdoc)) - goto bailout; - if (man && ! man_endparse(man)) - goto bailout; + /* + * With -Wstop and warnings or errors of at least + * the requested level, do not produce output. + */ + if (MANDOCLEVEL_OK != file_status && curp->wstop) + 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); - curp->outman = html_man; - curp->outmdoc = html_mdoc; - curp->outfree = html_free; 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; @@ -481,50 +578,286 @@ fdesc(struct curparse *curp) curp->outman = tree_man; curp->outmdoc = tree_mdoc; break; - case (OUTT_LINT): - break; - default: - curp->outdata = ascii_alloc(80); + 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; } } /* Execute the out device, if it exists. */ - if (man && curp->outman) - (*curp->outman)(curp->outdata, man); - if (mdoc && curp->outmdoc) - (*curp->outmdoc)(curp->outdata, mdoc); + if (curp->man && curp->outman) + (*curp->outman)(curp->outdata, curp->man); + if (curp->mdoc && curp->outmdoc) + (*curp->outmdoc)(curp->outdata, curp->mdoc); cleanup: - if (curp->mdoc) { - mdoc_free(curp->mdoc); - curp->mdoc = NULL; + + memset(&curp->regs, 0, sizeof(struct regset)); + + /* Reset the current-parse compilers. */ + + if (curp->mdoc) + mdoc_reset(curp->mdoc); + if (curp->man) + man_reset(curp->man); + + assert(curp->roff); + roff_reset(curp->roff); + + if (exit_status < file_status) + exit_status = file_status; + + return; +} + +static void +pdesc(struct curparse *curp) +{ + struct buf blk; + int with_mmap; + + /* + * Run for each opened file; may be called more than once for + * each full parse sequence if the opened file is nested (i.e., + * from `so'). Simply sucks in the whole file and moves into + * the parse phase for the file. + */ + + if ( ! read_whole_file(curp, &blk, &with_mmap)) { + file_status = MANDOCLEVEL_SYSERR; + return; } - if (curp->man) { - man_free(curp->man); - curp->man = NULL; - } - if (ln.buf) - free(ln.buf); + + /* Line number is per-file. */ + + curp->line = 1; + + parsebuf(curp, blk, 1); + if (with_mmap) munmap(blk.buf, blk.sz); else free(blk.buf); - return; - - bailout: - with_error = 1; - goto cleanup; } +static void +parsebuf(struct curparse *curp, struct buf blk, int start) +{ + struct buf ln; + enum rofferr rr; + int i, of, rc; + int pos; /* byte number in the ln buffer */ + int lnn; /* line number in the real file */ + unsigned char c; -static int -pset(const char *buf, int pos, struct curparse *curp, - struct man **man, struct mdoc **mdoc) + /* + * Main parse routine for an opened file. This is called for + * each opened file and simply loops around the full input file, + * possibly nesting (i.e., with `so'). + */ + + memset(&ln, 0, sizeof(struct buf)); + + lnn = curp->line; + pos = 0; + + for (i = 0; i < (int)blk.sz; ) { + if (0 == pos && '\0' == blk.buf[i]) + break; + + if (start) { + curp->line = lnn; + curp->reparse_count = 0; + } + + while (i < (int)blk.sz && (start || '\0' != blk.buf[i])) { + if ('\n' == blk.buf[i]) { + ++i; + ++lnn; + break; + } + + /* + * 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. + */ + + c = (unsigned char) blk.buf[i]; + + if ( ! (isascii(c) && + (isgraph(c) || isblank(c)))) { + mmsg(MANDOCERR_BADCHAR, curp, + curp->line, pos, "ignoring byte"); + i++; + continue; + } + + /* Trailing backslash = a plain char. */ + + 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 escape & at least one other char. */ + + if ('\n' == blk.buf[i + 1]) { + i += 2; + /* Escaped newlines are skipped over */ + ++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; + } + } + + /* 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 & cont. */ + + if (pos + 1 >= (int)ln.sz) + resize_buf(&ln, 256); + + ln.buf[pos++] = blk.buf[i++]; + ln.buf[pos++] = blk.buf[i++]; + } + + if (pos >= (int)ln.sz) + resize_buf(&ln, 256); + + ln.buf[pos] = '\0'; + + /* + * 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. + */ + + of = 0; + +rerun: + rr = roff_parseln + (curp->roff, curp->line, + &ln.buf, &ln.sz, of, &of); + + switch (rr) { + case (ROFF_REPARSE): + if (REPARSE_LIMIT >= ++curp->reparse_count) + parsebuf(curp, ln, 0); + else + mmsg(MANDOCERR_ROFFLOOP, curp, + curp->line, pos, NULL); + pos = 0; + continue; + case (ROFF_APPEND): + pos = strlen(ln.buf); + continue; + case (ROFF_RERUN): + goto rerun; + case (ROFF_IGN): + pos = 0; + continue; + case (ROFF_ERR): + assert(MANDOCLEVEL_FATAL <= file_status); + break; + case (ROFF_SO): + if (pfile(ln.buf + of, curp)) { + pos = 0; + continue; + } else + break; + default: + break; + } + + /* + * 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 ( ! (curp->man || curp->mdoc)) + pset(ln.buf + of, pos - of, curp); + + /* + * Lastly, push down into the parsers themselves. One + * of these will have already been set in the pset() + * routine. + * If libroff returns ROFF_TBL, then add it to the + * currently open parse. Since we only get here if + * there does exist data (see tbl_data.c), we're + * guaranteed that something's been allocated. + */ + + if (ROFF_TBL == rr) { + assert(curp->man || curp->mdoc); + if (curp->man) + man_addspan(curp->man, roff_span(curp->roff)); + else + mdoc_addspan(curp->mdoc, roff_span(curp->roff)); + + } else if (curp->man || curp->mdoc) { + rc = curp->man ? + man_parseln(curp->man, + curp->line, ln.buf, of) : + mdoc_parseln(curp->mdoc, + curp->line, ln.buf, of); + + if ( ! rc) { + assert(MANDOCLEVEL_FATAL <= file_status); + break; + } + } + + /* Temporary buffers typically are not full. */ + + if (0 == start && '\0' == blk.buf[i]) + break; + + /* Start the next input line. */ + + pos = 0; + } + + free(ln.buf); +} + +static void +pset(const char *buf, int pos, struct curparse *curp) { int i; @@ -534,49 +867,53 @@ pset(const char *buf, int pos, struct curparse *curp, * 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. + * + * Separate out pmdoc/pman from mdoc/man: the first persists + * through all parsers, while the latter is used per-parse. */ - 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); - return(1); + if (NULL == curp->pmdoc) + curp->pmdoc = mdoc_alloc + (&curp->regs, curp, mmsg); + assert(curp->pmdoc); + curp->mdoc = curp->pmdoc; + return; case (INTT_MAN): - if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) - return(0); - return(1); + if (NULL == curp->pman) + curp->pman = man_alloc + (&curp->regs, curp, mmsg); + assert(curp->pman); + curp->man = curp->pman; + 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); - return(1); + if (NULL == curp->pmdoc) + curp->pmdoc = mdoc_alloc + (&curp->regs, curp, mmsg); + assert(curp->pmdoc); + curp->mdoc = curp->pmdoc; + return; } - if (NULL == curp->man) - curp->man = man_init(curp); - if (NULL == (*man = curp->man)) - return(0); - return(1); + if (NULL == curp->pman) + curp->pman = man_alloc(&curp->regs, curp, mmsg); + assert(curp->pman); + curp->man = curp->pman; } - static int moptions(enum intt *tflags, char *arg) { @@ -595,7 +932,6 @@ moptions(enum intt *tflags, char *arg) return(1); } - static int toptions(struct curparse *curp, char *arg) { @@ -604,8 +940,7 @@ toptions(struct curparse *curp, char *arg) curp->outtype = OUTT_ASCII; else if (0 == strcmp(arg, "lint")) { curp->outtype = OUTT_LINT; - curp->wflags |= WARN_WALL; - curp->fflags |= FL_STRICT; + curp->wlevel = MANDOCLEVEL_WARNING; } else if (0 == strcmp(arg, "tree")) curp->outtype = OUTT_TREE; @@ -613,6 +948,10 @@ toptions(struct curparse *curp, char *arg) 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 { fprintf(stderr, "%s: Bad argument\n", arg); return(0); @@ -621,44 +960,38 @@ toptions(struct curparse *curp, char *arg) return(1); } - static int -foptions(int *fflags, char *arg) +woptions(struct curparse *curp, char *arg) { char *v, *o; - const char *toks[8]; + const char *toks[6]; - toks[0] = "ign-scope"; - toks[1] = "no-ign-escape"; - toks[2] = "no-ign-macro"; - toks[3] = "ign-errors"; - toks[4] = "strict"; - toks[5] = "ign-escape"; - 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 |= FL_IGN_SCOPE; + curp->wstop = 1; break; case (1): - *fflags |= FL_NIGN_ESCAPE; - break; + /* FALLTHROUGH */ case (2): - *fflags |= FL_NIGN_MACRO; + curp->wlevel = MANDOCLEVEL_WARNING; break; case (3): - *fflags |= FL_IGN_ERRORS; + curp->wlevel = MANDOCLEVEL_ERROR; break; case (4): - *fflags |= FL_STRICT; + curp->wlevel = MANDOCLEVEL_FATAL; break; - case (5): - *fflags &= ~FL_NIGN_ESCAPE; - break; default: - fprintf(stderr, "%s: Bad argument\n", o); + fprintf(stderr, "-W%s: Bad argument\n", o); return(0); } } @@ -666,72 +999,29 @@ foptions(int *fflags, char *arg) return(1); } - 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]) + /* LINTED */ + level--; - while (*arg) { - o = arg; - switch (getsubopt(&arg, UNCONST(toks), &v)) { - case (0): - *wflags |= WARN_WALL; - break; - case (1): - *wflags |= WARN_WERR; - break; - default: - fprintf(stderr, "%s: Bad argument\n", 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); - - with_error = 1; - - 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); - with_warning = 1; - if (curp->wflags & WARN_WERR) { - with_error = 1; - return(0); - } - - return(1); + if (file_status < level) + file_status = level; + + return(level < MANDOCLEVEL_FATAL); } -