Merge restructuring of main.c code. This provided by schwarze@ and inspected

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 2f5ff8dd58bf04b40c0660b0a4a57f429a8364cd..ee51348e11317d787851379372fad25e35fbfb6d 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,6 +1,7 @@
-/*     $Id: main.c,v 1.95 2010/07/01 15:38:56 schwarze Exp $ */
+/*     $Id: main.c,v 1.111 2010/12/01 15:09:01 kristaps Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  *
  * 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 <sys/stat.h>
 
 #include <assert.h>
 #include <sys/stat.h>
 
 #include <assert.h>

+#include <ctype.h>

 #include <fcntl.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdint.h>


@@ -30,12 +32,15 @@
 #include <unistd.h>
 
 #include "mandoc.h"
 #include <unistd.h>
 
 #include "mandoc.h"

-#include "regs.h"

 #include "main.h"
 #include "mdoc.h"
 #include "man.h"
 #include "roff.h"
 
 #include "main.h"
 #include "mdoc.h"
 #include "man.h"
 #include "roff.h"
 

+#ifndef MAP_FILE
+#define        MAP_FILE        0
+#endif
+

 #define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
 
 /* FIXME: Intel's compiler?  LLVM?  pcc?  */
 #define        UNCONST(a)      ((void *)(uintptr_t)(const void *)(a))
 
 /* FIXME: Intel's compiler?  LLVM?  pcc?  */


@@ -67,23 +72,16 @@ enum        outt {
        OUTT_HTML,
        OUTT_XHTML,
        OUTT_LINT,
        OUTT_HTML,
        OUTT_XHTML,
        OUTT_LINT,

-       OUTT_PS
+       OUTT_PS,
+       OUTT_PDF

 };
 
 struct curparse {
        const char       *file;         /* Current parse. */
        int               fd;           /* Current parse. */
 };
 
 struct curparse {
        const char       *file;         /* Current parse. */
        int               fd;           /* Current parse. */

-       int               wflags;
-       /* FIXME: set by max error */
-#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 /* ignore nothing */
+       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       *man;          /* man parser */
        struct mdoc      *mdoc;         /* mdoc parser */
        enum intt         inttype;      /* which parser to use */
        struct man       *man;          /* man parser */
        struct mdoc      *mdoc;         /* mdoc parser */


@@ -97,6 +95,26 @@ struct       curparse {
        char              outopts[BUFSIZ]; /* buf of output opts */
 };
 
        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",
 
 static const char * const      mandocerrs[MANDOCERR_MAX] = {
        "ok",
 


@@ -108,20 +126,17 @@ static    const char * const      mandocerrs[MANDOCERR_MAX] = {
        "out of order prologue",
        "repeated prologue entry",
        "list type must come first",
        "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",
        "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",
        "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",
 
 
        "generic error",
 


@@ -129,9 +144,11 @@ static     const char * const      mandocerrs[MANDOCERR_MAX] = {
        "bad Boolean value",
        "child violates parent syntax",
        "bad AT&T symbol",
        "bad Boolean value",
        "child violates parent syntax",
        "bad AT&T symbol",

+       "bad standard",

        "list type repeated",
        "display type repeated",
        "argument repeated",
        "list type repeated",
        "display type repeated",
        "argument repeated",

+       "ignoring argument",

        "manual name not yet set",
        "obsolete macro ignored",
        "empty macro ignored",
        "manual name not yet set",
        "obsolete macro ignored",
        "empty macro ignored",


@@ -143,28 +160,30 @@ static    const char * const      mandocerrs[MANDOCERR_MAX] = {
        "no text in this context",
        "bad comment style",
        "unknown macro will be lost",
        "no text in this context",
        "bad comment style",
        "unknown macro will be lost",

+       "NOT IMPLEMENTED: skipping request",

        "line scope broken",
        "argument count wrong",
        "request scope close w/none open",
        "scope already open",
        "line scope broken",
        "argument count wrong",
        "request scope close w/none open",
        "scope already open",

+       "scope open on exit",

        "macro requires line argument(s)",
        "macro requires body argument(s)",
        "macro requires argument(s)",
        "no title in document",
        "missing list type",
        "missing display type",
        "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",
        "line argument(s) will be lost",
        "body argument(s) will be lost",

+       "paragraph macro ignored",

 
        "generic fatal error",
 
        "column syntax is inconsistent",
 
        "generic fatal error",
 
        "column syntax is inconsistent",

-       "missing font type",

        "displays may not be nested",
        "unsupported display type",
        "blocks badly nested",
        "no such block is open",
        "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",
        "line scope broken, syntax violated",
        "argument count wrong, violates syntax",
        "child violates parent syntax",


@@ -172,28 +191,26 @@ static    const char * const      mandocerrs[MANDOCERR_MAX] = {
        "no document body",
        "no document prologue",
        "utsname system call failed",
        "no document body",
        "no document prologue",
        "utsname system call failed",

-       "memory exhausted",
+       "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 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 struct roff      *roff_init(struct curparse *);
+static int               pfile(const char *, struct curparse *);

 static int               moptions(enum intt *, char *);
 static int               mmsg(enum mandocerr, void *, 
                                int, int, const char *);
 static int               moptions(enum intt *, char *);
 static int               mmsg(enum mandocerr, void *, 
                                int, int, const char *);

-static int               pset(const char *, int, struct curparse *,
+static void              pset(const char *, int, struct curparse *,

                                struct man **, struct mdoc **);
 static int               toptions(struct curparse *, char *);
 static void              usage(void) __attribute__((noreturn));
 static void              version(void) __attribute__((noreturn));
                                struct man **, struct mdoc **);
 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 const char       *progname;

-static int               with_fatal;
-static int               with_error;
+static enum mandoclevel  exit_status = MANDOCLEVEL_OK;

 
 int
 main(int argc, char *argv[])
 
 int
 main(int argc, char *argv[])


@@ -211,17 +228,14 @@ main(int argc, char *argv[])
 
        curp.inttype = INTT_AUTO;
        curp.outtype = OUTT_ASCII;
 
        curp.inttype = INTT_AUTO;
        curp.outtype = OUTT_ASCII;

+       curp.wlevel  = MANDOCLEVEL_FATAL;

 
        /* LINTED */
 
        /* LINTED */

-       while (-1 != (c = getopt(argc, argv, "f:m:O:T:VW:")))
+       while (-1 != (c = getopt(argc, argv, "m:O:T:VW:")))

                switch (c) {
                switch (c) {

-               case ('f'):
-                       if ( ! foptions(&curp.fflags, optarg))
-                               return(EXIT_FAILURE);
-                       break;

                case ('m'):
                        if ( ! moptions(&curp.inttype, optarg))
                case ('m'):
                        if ( ! moptions(&curp.inttype, optarg))

-                               return(EXIT_FAILURE);
+                               return((int)MANDOCLEVEL_BADARG);

                        break;
                case ('O'):
                        (void)strlcat(curp.outopts, optarg, BUFSIZ);
                        break;
                case ('O'):
                        (void)strlcat(curp.outopts, optarg, BUFSIZ);


@@ -229,11 +243,11 @@ main(int argc, char *argv[])
                        break;
                case ('T'):
                        if ( ! toptions(&curp, optarg))
                        break;
                case ('T'):
                        if ( ! toptions(&curp, optarg))

-                               return(EXIT_FAILURE);
+                               return((int)MANDOCLEVEL_BADARG);

                        break;
                case ('W'):
                        break;
                case ('W'):

-                       if ( ! woptions(&curp.wflags, optarg))
-                               return(EXIT_FAILURE);
+                       if ( ! woptions(&curp, optarg))
+                               return((int)MANDOCLEVEL_BADARG);

                        break;
                case ('V'):
                        version();
                        break;
                case ('V'):
                        version();


@@ -255,8 +269,7 @@ main(int argc, char *argv[])
 
        while (*argv) {
                ffile(*argv, &curp);
 
        while (*argv) {
                ffile(*argv, &curp);

-
-               if (with_fatal && !(curp.fflags & FL_IGN_ERRORS))
+               if (MANDOCLEVEL_OK != exit_status && curp.wstop)

                        break;
                ++argv;
        }
                        break;
                ++argv;
        }


@@ -270,8 +283,7 @@ main(int argc, char *argv[])
        if (curp.roff)
                roff_free(curp.roff);
 
        if (curp.roff)
                roff_free(curp.roff);
 

-       return((with_fatal || with_error) ? 
-                       EXIT_FAILURE :  EXIT_SUCCESS);
+       return((int)exit_status);

 }
 
 
 }
 
 


@@ -280,7 +292,7 @@ version(void)
 {
 
        (void)printf("%s %s\n", progname, VERSION);
 {
 
        (void)printf("%s %s\n", progname, VERSION);

-       exit(EXIT_SUCCESS);
+       exit((int)MANDOCLEVEL_OK);

 }
 
 
 }
 
 


@@ -291,92 +303,67 @@ usage(void)
        (void)fprintf(stderr, "usage: %s [-V] [-foption] "
                        "[-mformat] [-Ooption] [-Toutput] "
                        "[-Werr] [file...]\n", progname);
        (void)fprintf(stderr, "usage: %s [-V] [-foption] "
                        "[-mformat] [-Ooption] [-Toutput] "
                        "[-Werr] [file...]\n", progname);

-       exit(EXIT_FAILURE);
+       exit((int)MANDOCLEVEL_BADARG);

 }
 
 
 }
 
 

-static struct man *
-man_init(struct curparse *curp)
+static void
+ffile(const char *file, struct curparse *curp)

 {
 {

-       int              pflags;
-
-       /* Defaults from mandoc.1. */

 
 

-       pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE;
+       curp->file = file;
+       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->regs, curp, pflags, mmsg));
+       if (-1 == close(curp->fd))
+               perror(curp->file);

 }
 
 }
 

-
-static struct roff *
-roff_init(struct curparse *curp)
+static int
+pfile(const char *file, struct curparse *curp)

 {
 {

+       const char      *savefile;
+       int              fd, savefd;

 
 

-       return(roff_alloc(&curp->regs, mmsg, curp));
-}
+       if (-1 == (fd = open(file, O_RDONLY, 0))) {
+               perror(file);
+               exit_status = MANDOCLEVEL_SYSERR;
+               return(0);
+       }

 
 

+       savefile = curp->file;
+       savefd = curp->fd;

 
 

-static struct mdoc *
-mdoc_init(struct curparse *curp)
-{
-       int              pflags;
+       curp->file = file;
+       curp->fd = fd;

 
 

-       /* Defaults from mandoc.1. */
+       pdesc(curp);

 
 

-       pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE;
+       curp->file = savefile;
+       curp->fd = savefd;

 
 

-       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;
+       if (-1 == close(fd))
+               perror(file);

 
 

-       return(mdoc_alloc(&curp->regs, curp, pflags, mmsg));
+       return(MANDOCLEVEL_FATAL > exit_status ? 1 : 0);

 }
 
 
 static void
 }
 
 
 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_fatal = 1;
-               return;
-       }
-
-       fdesc(curp);
-
-       if (-1 == close(curp->fd))
-               perror(curp->file);
-}
-
-
-static int

 resize_buf(struct buf *buf, size_t initial)
 {
 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 ? 2 * buf->sz : initial;
+       buf->buf = realloc(buf->buf, buf->sz);
+       if (NULL == buf->buf) {

                perror(NULL);
                perror(NULL);

-               return(0);
+               exit((int)MANDOCLEVEL_SYSERR);

        }
        }

-       buf->buf = tmp;
-       buf->sz = sz;
-       return(1);

 }
 
 
 }
 
 


@@ -389,7 +376,6 @@ read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
 
        if (-1 == fstat(curp->fd, &st)) {
                perror(curp->file);
 
        if (-1 == fstat(curp->fd, &st)) {
                perror(curp->file);

-               with_fatal = 1;

                return(0);
        }
 
                return(0);
        }
 


@@ -404,7 +390,6 @@ read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
                if (st.st_size >= (1U << 31)) {
                        fprintf(stderr, "%s: input too large\n", 
                                        curp->file);
                if (st.st_size >= (1U << 31)) {
                        fprintf(stderr, "%s: input too large\n", 
                                        curp->file);

-                       with_fatal = 1;

                        return(0);
                }
                *with_mmap = 1;
                        return(0);
                }
                *with_mmap = 1;


@@ -431,8 +416,7 @@ read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
                                                curp->file);
                                break;
                        }
                                                curp->file);
                                break;
                        }

-                       if (! resize_buf(fb, 65536))
-                               break;
+                       resize_buf(fb, 65536);

                }
                ssz = read(curp->fd, fb->buf + (int)off, fb->sz - off);
                if (ssz == 0) {
                }
                ssz = read(curp->fd, fb->buf + (int)off, fb->sz - off);
                if (ssz == 0) {


@@ -448,7 +432,6 @@ read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
 
        free(fb->buf);
        fb->buf = NULL;
 
        free(fb->buf);
        fb->buf = NULL;

-       with_fatal = 1;

        return(0);
 }
 
        return(0);
 }
 


@@ -456,46 +439,198 @@ read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
 static void
 fdesc(struct curparse *curp)
 {
 static void
 fdesc(struct curparse *curp)
 {

-       struct buf       ln, blk;
-       int              i, pos, lnn, lnn_start, with_mmap, of;
-       enum rofferr     re;

        struct man      *man;
        struct mdoc     *mdoc;
        struct roff     *roff;
 
        struct man      *man;
        struct mdoc     *mdoc;
        struct roff     *roff;
 

-       man = NULL;
-       mdoc = NULL;
-       roff = NULL;
+       pdesc(curp);

 
 

-       memset(&ln, 0, sizeof(struct buf));
+       man  = curp->man;
+       mdoc = curp->mdoc;
+       roff = curp->roff;
+
+       if (MANDOCLEVEL_FATAL <= exit_status)
+               goto cleanup;
+
+       /* NOTE a parser may not have been assigned, yet. */
+
+       if ( ! (man || mdoc)) {
+               fprintf(stderr, "%s: Not a manual\n", curp->file);
+               exit_status = MANDOCLEVEL_FATAL;
+               goto cleanup;
+       }
+
+       /* 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;
+       }

 
        /*
 
        /*

-        * Two buffers: ln and buf.  buf is the input file and may be
-        * memory mapped.  ln is a line buffer and grows on-demand.
+        * With -Wstop and warnings or errors of at least
+        * the requested level, do not produce output.

         */
 
         */
 

-       if ( ! read_whole_file(curp, &blk, &with_mmap))
+       if (MANDOCLEVEL_OK != exit_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);
+                       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;
+                       break;
+               case (OUTT_TREE):
+                       curp->outman = tree_man;
+                       curp->outmdoc = tree_mdoc;
+                       break;
+               case (OUTT_PDF):
+                       /* FALLTHROUGH */
+               case (OUTT_ASCII):
+                       /* FALLTHROUGH */
+               case (OUTT_PS):
+                       curp->outman = terminal_man;
+                       curp->outmdoc = terminal_mdoc;
+                       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);
+
+ cleanup:
+       memset(&curp->regs, 0, sizeof(struct regset));
+       if (mdoc)
+               mdoc_reset(mdoc);
+       if (man)
+               man_reset(man);
+       if (roff)
+               roff_reset(roff);
+
+       return;
+}
+
+
+static void
+pdesc(struct curparse *curp)
+{
+       struct buf       blk;
+       int              with_mmap;
+
+       if ( ! read_whole_file(curp, &blk, &with_mmap)) {
+               exit_status = MANDOCLEVEL_SYSERR;

                return;
                return;

+       }

 
        if (NULL == curp->roff) 
 
        if (NULL == curp->roff) 

-               curp->roff = roff_init(curp);
-       if (NULL == (roff = curp->roff))
-               goto bailout;
+               curp->roff = roff_alloc(&curp->regs, curp, mmsg);
+       assert(curp->roff);

 
 

-       for (i = 0, lnn = 1; i < (int)blk.sz;) {
-               pos = 0;
-               lnn_start = lnn;
-               while (i < (int)blk.sz) {
+       curp->line = 1;
+       parsebuf(curp, blk, 1);
+
+       if (with_mmap)
+               munmap(blk.buf, blk.sz);
+       else
+               free(blk.buf);
+}
+
+static void
+parsebuf(struct curparse *curp, struct buf blk, int start)
+{
+       struct buf       ln;
+       int              i, pos, lnn, of;
+       unsigned char    c;
+       struct man      *man;
+       struct mdoc     *mdoc;
+       struct roff     *roff;
+
+       man  = curp->man;
+       mdoc = curp->mdoc;
+       roff = curp->roff;
+
+       memset(&ln, 0, sizeof(struct buf));
+
+       lnn = curp->line;  /* line number in the real file */
+       pos = 0;  /* byte number in the ln buffer */
+
+       for (i = 0; i < (int)blk.sz;) {
+               if (0 == pos && '\0' == blk.buf[i])
+                       break;
+               if (start)
+                       curp->line = lnn;
+
+               while (i < (int)blk.sz && (start || '\0' != blk.buf[i])) {

                        if ('\n' == blk.buf[i]) {
                                ++i;
                                ++lnn;
                                break;
                        }
                        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 is like a plain character. */
                        if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) {
                                if (pos >= (int)ln.sz)
                        /* Trailing backslash is like a plain character. */
                        if ('\\' != blk.buf[i] || i + 1 == (int)blk.sz) {
                                if (pos >= (int)ln.sz)

-                                       if (! resize_buf(&ln, 256))
-                                               goto bailout;
+                                       resize_buf(&ln, 256);

                                ln.buf[pos++] = blk.buf[i++];
                                continue;
                        }
                                ln.buf[pos++] = blk.buf[i++];
                                continue;
                        }


@@ -527,16 +662,14 @@ fdesc(struct curparse *curp)
                        }
                        /* Some other escape sequence, copy and continue. */
                        if (pos + 1 >= (int)ln.sz)
                        }
                        /* Some other escape sequence, copy and continue. */
                        if (pos + 1 >= (int)ln.sz)

-                               if (! resize_buf(&ln, 256))
-                                       goto bailout;
+                               resize_buf(&ln, 256);

 
                        ln.buf[pos++] = blk.buf[i++];
                        ln.buf[pos++] = blk.buf[i++];
                }
 
                if (pos >= (int)ln.sz)
 
                        ln.buf[pos++] = blk.buf[i++];
                        ln.buf[pos++] = blk.buf[i++];
                }
 
                if (pos >= (int)ln.sz)

-                       if (! resize_buf(&ln, 256))
-                               goto bailout;
+                       resize_buf(&ln, 256);

                ln.buf[pos] = '\0';
 
                /*
                ln.buf[pos] = '\0';
 
                /*


@@ -549,15 +682,33 @@ fdesc(struct curparse *curp)
                 */
 
                of = 0;
                 */
 
                of = 0;

-               do {
-                       re = roff_parseln(roff, lnn_start, 
-                                       &ln.buf, &ln.sz, of, &of);
-               } while (ROFF_RERUN == re);
-
-               if (ROFF_IGN == re)
+rerun:
+               switch (roff_parseln(roff, curp->line, &ln.buf, &ln.sz,
+                   of, &of)) {
+               case (ROFF_REPARSE):
+                       parsebuf(curp, ln, 0);
+                       pos = 0;
+                       continue;
+               case (ROFF_APPEND):
+                       pos = strlen(ln.buf);

                        continue;
                        continue;

-               else if (ROFF_ERR == re)
-                       goto bailout;
+               case (ROFF_RERUN):
+                       goto rerun;
+               case (ROFF_IGN):
+                       pos = 0;
+                       continue;
+               case (ROFF_ERR):
+                       assert(MANDOCLEVEL_FATAL <= exit_status);
+                       break;
+               case (ROFF_SO):
+                       if (pfile(ln.buf + of, curp)) {
+                               pos = 0;
+                               continue;
+                       } else
+                               break;
+               case (ROFF_CONT):
+                       break;
+               }

 
                /*
                 * If input parsers have not been allocated, do so now.
 
                /*
                 * If input parsers have not been allocated, do so now.


@@ -567,109 +718,32 @@ fdesc(struct curparse *curp)
                 */
 
                if ( ! (man || mdoc))
                 */
 
                if ( ! (man || mdoc))

-                       if ( ! pset(ln.buf + of, pos - of, curp, &man, &mdoc))
-                               goto bailout;
+                       pset(ln.buf + of, pos - of, curp, &man, &mdoc);

 
                /* Lastly, push down into the parsers themselves. */
 
 
                /* Lastly, push down into the parsers themselves. */
 

-               if (man && ! man_parseln(man, lnn_start, ln.buf, of))
-                       goto bailout;
-               if (mdoc && ! mdoc_parseln(mdoc, lnn_start, ln.buf, of))
-                       goto bailout;
-       }
-
-       /* NOTE a parser may not have been assigned, yet. */
-
-       if ( ! (man || mdoc)) {
-               fprintf(stderr, "%s: Not a manual\n", curp->file);
-               goto bailout;
-       }
-
-       /* Clean up the parse routine ASTs. */
-
-       if (mdoc && ! mdoc_endparse(mdoc))
-               goto bailout;
-       if (man && ! man_endparse(man))
-               goto bailout;
-       if (roff && ! roff_endparse(roff))
-               goto bailout;
-
-       /* 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_PS):
-                       curp->outdata = ps_alloc(curp->outopts);
-                       curp->outfree = ps_free;
-                       break;
-               default:
+               if (man && ! man_parseln(man, curp->line, ln.buf, of)) {
+                       assert(MANDOCLEVEL_FATAL <= exit_status);

                        break;
                }
                        break;
                }

-
-               switch (curp->outtype) {
-               case (OUTT_HTML):
-                       /* FALLTHROUGH */
-               case (OUTT_XHTML):
-                       curp->outman = html_man;
-                       curp->outmdoc = html_mdoc;
-                       curp->outfree = html_free;
-                       break;
-               case (OUTT_TREE):
-                       curp->outman = tree_man;
-                       curp->outmdoc = tree_mdoc;
-                       break;
-               case (OUTT_ASCII):
-                       /* FALLTHROUGH */
-               case (OUTT_PS):
-                       curp->outman = terminal_man;
-                       curp->outmdoc = terminal_mdoc;
-                       break;
-               default:
+               if (mdoc && ! mdoc_parseln(mdoc, curp->line, ln.buf, of)) {
+                       assert(MANDOCLEVEL_FATAL <= exit_status);

                        break;
                }
                        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);

 
 

- 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);
+               /* Temporary buffers typically are not full. */
+               if (0 == start && '\0' == blk.buf[i])
+                       break;

 
 

-       return;
+               /* Start the next input line. */
+               pos = 0;
+       }

 
 

- bailout:
-       with_fatal = 1;
-       goto cleanup;
+       free(ln.buf);

 }
 
 
 }
 
 

-static int
+static void

 pset(const char *buf, int pos, struct curparse *curp,
                struct man **man, struct mdoc **mdoc)
 {
 pset(const char *buf, int pos, struct curparse *curp,
                struct man **man, struct mdoc **mdoc)
 {


@@ -687,40 +761,39 @@ pset(const char *buf, int pos, struct curparse *curp,
                for (i = 1; buf[i]; i++)
                        if (' ' != buf[i] && '\t' != buf[i])
                                break;
                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) 
        }
 
        switch (curp->inttype) {
        case (INTT_MDOC):
                if (NULL == curp->mdoc) 

-                       curp->mdoc = mdoc_init(curp);
-               if (NULL == (*mdoc = curp->mdoc))
-                       return(0);
-               return(1);
+                       curp->mdoc = mdoc_alloc(&curp->regs, curp, mmsg);
+               assert(curp->mdoc);
+               *mdoc = curp->mdoc;
+               return;

        case (INTT_MAN):
                if (NULL == curp->man) 
        case (INTT_MAN):
                if (NULL == curp->man) 

-                       curp->man = man_init(curp);
-               if (NULL == (*man = curp->man))
-                       return(0);
-               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) 
        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);
+                       curp->mdoc = mdoc_alloc(&curp->regs, curp, mmsg);
+               assert(curp->mdoc);
+               *mdoc = curp->mdoc;
+               return;

        } 
 
        if (NULL == curp->man) 
        } 
 
        if (NULL == curp->man) 

-               curp->man = man_init(curp);
-       if (NULL == (*man = curp->man))
-               return(0);
-       return(1);
+               curp->man = man_alloc(&curp->regs, curp, mmsg);
+       assert(curp->man);
+       *man = curp->man;

 }
 
 
 }
 
 


@@ -751,8 +824,7 @@ toptions(struct curparse *curp, char *arg)
                curp->outtype = OUTT_ASCII;
        else if (0 == strcmp(arg, "lint")) {
                curp->outtype = OUTT_LINT;
                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;
        }
        else if (0 == strcmp(arg, "tree"))
                curp->outtype = OUTT_TREE;


@@ -762,6 +834,8 @@ toptions(struct curparse *curp, char *arg)
                curp->outtype = OUTT_XHTML;
        else if (0 == strcmp(arg, "ps"))
                curp->outtype = OUTT_PS;
                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);
        else {
                fprintf(stderr, "%s: Bad argument\n", arg);
                return(0);


@@ -772,71 +846,37 @@ toptions(struct curparse *curp, char *arg)
 
 
 static int
 
 
 static int

-foptions(int *fflags, char *arg)
+woptions(struct curparse *curp, char *arg)

 {
        char            *v, *o;
 {
        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):
 
        while (*arg) {
                o = arg;
                switch (getsubopt(&arg, UNCONST(toks), &v)) {
                case (0):

-                       *fflags |= FL_IGN_SCOPE;
+                       curp->wstop = 1;

                        break;
                case (1):
                        break;
                case (1):

-                       *fflags |= FL_NIGN_ESCAPE;
-                       break;
+                       /* FALLTHROUGH */

                case (2):
                case (2):

-                       *fflags |= FL_NIGN_MACRO;
+                       curp->wlevel = MANDOCLEVEL_WARNING;

                        break;
                case (3):
                        break;
                case (3):

-                       *fflags |= FL_IGN_ERRORS;
+                       curp->wlevel = MANDOCLEVEL_ERROR;

                        break;
                case (4):
                        break;
                case (4):

-                       *fflags |= FL_STRICT;
-                       break;
-               case (5):
-                       *fflags &= ~FL_NIGN_ESCAPE;
-                       break;
-               default:
-                       fprintf(stderr, "%s: Bad argument\n", o);
-                       return(0);
-               }
-       }
-
-       return(1);
-}
-
-
-static int
-woptions(int *wflags, char *arg)
-{
-       char            *v, *o;
-       const char      *toks[3]; 
-
-       toks[0] = "all";
-       toks[1] = "error";
-       toks[2] = NULL;
-
-       while (*arg) {
-               o = arg;
-               switch (getsubopt(&arg, UNCONST(toks), &v)) {
-               case (0):
-                       *wflags |= WARN_WALL;
-                       break;
-               case (1):
-                       *wflags |= WARN_WERR;
+                       curp->wlevel = MANDOCLEVEL_FATAL;

                        break;
                default:
                        break;
                default:

-                       fprintf(stderr, "%s: Bad argument\n", o);
+                       fprintf(stderr, "-W%s: Bad argument\n", o);

                        return(0);
                }
        }
                        return(0);
                }
        }


@@ -849,37 +889,25 @@ static int
 mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg)
 {
        struct curparse *cp;
 mmsg(enum mandocerr t, void *arg, int ln, int col, const char *msg)
 {
        struct curparse *cp;

-       const char *level;
-       int rc;
+       enum mandoclevel level;
+
+       level = MANDOCLEVEL_FATAL;
+       while (t < mandoclimits[level])
+               /* LINTED */
+               level--;

 
        cp = (struct curparse *)arg;
 
        cp = (struct curparse *)arg;

-       level = NULL;
-       rc = 1;
-
-       if (t >= MANDOCERR_FATAL) {
-               with_fatal = 1;
-               level = "FATAL";
-               rc = 0;
-       } else {
-               if ( ! (WARN_WALL & cp->wflags))
-                       return(1);
-               if (t >= MANDOCERR_ERROR) {
-                       with_error = 1;
-                       level = "ERROR";
-               }
-               if (WARN_WERR & cp->wflags) {
-                       with_fatal = 1;
-                       rc = 0;
-               }
-       }
+       if (level < cp->wlevel)
+               return(1);

 
 

-       fprintf(stderr, "%s:%d:%d:", cp->file, ln, col + 1);
-       if (level)
-               fprintf(stderr, " %s:", level);
-       fprintf(stderr, " %s", mandocerrs[t]);
+       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 (msg)
                fprintf(stderr, ": %s", msg);
        fputc('\n', stderr);
 

-       return(rc);
+       if (exit_status < level)
+               exit_status = level;
+       
+       return(level < MANDOCLEVEL_FATAL);

 }
 }