Prefix messages about bad command line options and arguments

[mandoc.git] / main.c

diff --git a/main.c b/main.c
index 902d732437132ea60f25c8d4d55852797127d278..2323cd8daba83076aae9e11604dbe3c8139b5bb0 100644 (file)
--- a/main.c
+++ b/main.c
@@ -1,152 +1,142 @@
-/* $Id: main.c,v 1.15 2009/03/25 21:03:13 kristaps Exp $ */
+/*     $Id: main.c,v 1.176 2014/06/21 16:18:25 schwarze Exp $ */

 /*
 /*

- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
+ * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
+ * Copyright (c) 2010 Joerg Sonnenberger <joerg@netbsd.org>

  *
  * Permission to use, copy, modify, and distribute this software for any
  *
  * Permission to use, copy, modify, and distribute this software for any

- * purpose with or without fee is hereby granted, provided that the
- * above copyright notice and this permission notice appear in all
- * copies.
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.

  *
  *

- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL
- * WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
- * AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
- * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
- * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

  */
  */

-#include <sys/stat.h>
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif

 
 #include <assert.h>
 
 #include <assert.h>

-#include <err.h>
-#include <fcntl.h>

 #include <stdio.h>
 #include <stdio.h>

+#include <stdint.h>

 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 

+#include "mandoc.h"
+#include "mandoc_aux.h"
+#include "main.h"

 #include "mdoc.h"
 #include "man.h"
 
 #include "mdoc.h"
 #include "man.h"
 

-#ifdef __linux__
-extern int               getsubopt(char **, char * const *, char **);
-# ifndef __dead
-#  define __dead __attribute__((__noreturn__))
-# endif
-#elif defined(__dead2)
-# ifndef __dead
-#  define __dead __dead2
+#if !defined(__GNUC__) || (__GNUC__ < 2)
+# if !defined(lint)
+#  define __attribute__(x)

 # endif
 # endif

-#endif
-
-struct buf {
-       char             *buf;
-       size_t            sz;
-};
-
-struct curparse {
-       const char       *file;
-       int               wflags;
-#define        WARN_WALL         0x03          /* All-warnings mask. */
-#define        WARN_WCOMPAT     (1 << 0)       /* Compatibility warnings. */
-#define        WARN_WSYNTAX     (1 << 1)       /* Syntax warnings. */
-#define        WARN_WERR        (1 << 2)       /* Warnings->errors. */
-};
+#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */

 
 

-#define        IGN_SCOPE        (1 << 0) /* Flag to ignore scope. */
-#define        IGN_ESCAPE       (1 << 1) /* Flag to ignore bad escapes. */
-#define        IGN_MACRO        (1 << 2) /* Flag to ignore unknown macros. */
+typedef        void            (*out_mdoc)(void *, const struct mdoc *);
+typedef        void            (*out_man)(void *, const struct man *);
+typedef        void            (*out_free)(void *);

 
 

-enum   intt {
-       INTT_MDOC = 0,
-       INTT_MAN
+enum   outt {
+       OUTT_ASCII = 0, /* -Tascii */
+       OUTT_LOCALE,    /* -Tlocale */
+       OUTT_UTF8,      /* -Tutf8 */
+       OUTT_TREE,      /* -Ttree */
+       OUTT_MAN,       /* -Tman */
+       OUTT_HTML,      /* -Thtml */
+       OUTT_XHTML,     /* -Txhtml */
+       OUTT_LINT,      /* -Tlint */
+       OUTT_PS,        /* -Tps */
+       OUTT_PDF        /* -Tpdf */

 };
 
 };
 

-enum   outt {
-       OUTT_ASCII = 0,
-       OUTT_LATIN1,
-       OUTT_UTF8,
-       OUTT_TREE,
-       OUTT_LINT
+struct curparse {
+       struct mparse    *mp;
+       enum mandoclevel  wlevel;       /* ignore messages below this */
+       int               wstop;        /* stop after a file with a warning */
+       enum outt         outtype;      /* which output to use */
+       out_mdoc          outmdoc;      /* mdoc output ptr */
+       out_man           outman;       /* man output ptr */
+       out_free          outfree;      /* free output ptr */
+       void             *outdata;      /* data for output */
+       char              outopts[BUFSIZ]; /* buf of output opts */

 };
 
 };
 

-typedef        int             (*out_run)(void *, const struct man *,
-                               const struct mdoc *);
-typedef        void            (*out_free)(void *);
+static int               moptions(int *, char *);
+static void              mmsg(enum mandocerr, enum mandoclevel,
+                               const char *, int, int, const char *);
+static void              parse(struct curparse *, int,
+                               const char *, enum mandoclevel *);
+static int               toptions(struct curparse *, char *);
+static void              usage(void) __attribute__((noreturn));
+static void              version(void) __attribute__((noreturn));
+static int               woptions(struct curparse *, char *);

 
 

-extern char             *__progname;
-
-extern void             *ascii_alloc(void);
-extern void             *latin1_alloc(void);
-extern void             *utf8_alloc(void);
-extern int               terminal_run(void *, const struct man *, 
-                               const struct mdoc *);
-extern int               tree_run(void *, const struct man *,
-                               const struct mdoc *);
-extern void              terminal_free(void *);
-
-static int               foptions(int *, char *);
-static int               toptions(enum outt *, char *);
-static int               moptions(enum intt *, char *);
-static int               woptions(int *, char *);
-static int               merr(void *, int, int, const char *);
-static int               manwarn(void *, int, int, const char *);
-static int               mdocwarn(void *, int, int, 
-                               enum mdoc_warn, const char *);
-static int               file(struct buf *, struct buf *, 
-                               const char *, 
-                               struct man *, struct mdoc *);
-static int               fdesc(struct buf *, struct buf *,
-                               const char *, int, 
-                               struct man *, struct mdoc *);
-
-__dead static void       version(void);
-__dead static void       usage(void);
+static const char       *progname;

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

-       int              c, rc, fflags, pflags;
-       struct mdoc_cb   mdoccb;
-       struct man_cb    mancb;
-       struct man      *man;
-       struct mdoc     *mdoc;
-       void            *outdata;
-       enum outt        outtype;
-       enum intt        inttype;
-       struct buf       ln, blk;
-       out_run          outrun;
-       out_free         outfree;
+       int              c;

        struct curparse  curp;
        struct curparse  curp;

+       int              options;
+       enum mandoclevel rc;
+       char            *defos;
+
+       progname = strrchr(argv[0], '/');
+       if (progname == NULL)
+               progname = argv[0];
+       else
+               ++progname;

 
 

-       fflags = 0;
-       outtype = OUTT_ASCII;
-       inttype = INTT_MDOC;
+       memset(&curp, 0, sizeof(struct curparse));

 
 

-       bzero(&curp, sizeof(struct curparse));
+       options = MPARSE_SO;
+       curp.outtype = OUTT_ASCII;
+       curp.wlevel  = MANDOCLEVEL_FATAL;
+       defos = NULL;

 
 

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

                switch (c) {
                switch (c) {

-               case ('f'):
-                       if ( ! foptions(&fflags, optarg))
-                               return(0);
+               case 'I':
+                       if (strncmp(optarg, "os=", 3)) {
+                               fprintf(stderr,
+                                   "%s: -I%s: Bad argument\n",
+                                   progname, optarg);
+                               return((int)MANDOCLEVEL_BADARG);
+                       }
+                       if (defos) {
+                               fprintf(stderr,
+                                   "%s: -I%s: Duplicate argument\n",
+                                   progname, optarg);
+                               return((int)MANDOCLEVEL_BADARG);
+                       }
+                       defos = mandoc_strdup(optarg + 3);
+                       break;
+               case 'm':
+                       if ( ! moptions(&options, optarg))
+                               return((int)MANDOCLEVEL_BADARG);

                        break;
                        break;

-               case ('m'):
-                       if ( ! moptions(&inttype, optarg))
-                               return(0);
+               case 'O':
+                       (void)strlcat(curp.outopts, optarg, BUFSIZ);
+                       (void)strlcat(curp.outopts, ",", BUFSIZ);

                        break;
                        break;

-               case ('T'):
-                       if ( ! toptions(&outtype, optarg))
-                               return(0);
+               case 'T':
+                       if ( ! toptions(&curp, optarg))
+                               return((int)MANDOCLEVEL_BADARG);

                        break;
                        break;

-               case ('W'):
-                       if ( ! woptions(&curp.wflags, optarg))
-                               return(0);
+               case 'W':
+                       if ( ! woptions(&curp, optarg))
+                               return((int)MANDOCLEVEL_BADARG);

                        break;
                        break;

-               case ('V'):
+               case 'V':

                        version();
                        /* NOTREACHED */
                default:
                        version();
                        /* NOTREACHED */
                default:


@@ -154,439 +144,284 @@ main(int argc, char *argv[])
                        /* NOTREACHED */
                }
 
                        /* NOTREACHED */
                }
 

-       argc -= optind;
-       argv += optind;
+       curp.mp = mparse_alloc(options, curp.wlevel, mmsg, defos);

 
        /*
 
        /*

-        * Allocate the appropriate front-end.  Note that utf8, ascii
-        * and latin1 all resolve to the terminal front-end with
-        * different encodings (see terminal.c).  Not all frontends have
-        * cleanup or alloc routines.
+        * Conditionally start up the lookaside buffer before parsing.

         */
         */

+       if (OUTT_MAN == curp.outtype)
+               mparse_keep(curp.mp);

 
 

-       switch (outtype) {
-       case (OUTT_LATIN1):
-               outdata = latin1_alloc();
-               outrun = terminal_run;
-               outfree = terminal_free;
-               break;
-       case (OUTT_UTF8):
-               outdata = utf8_alloc();
-               outrun = terminal_run;
-               outfree = terminal_free;
-               break;
-       case (OUTT_TREE):
-               outdata = NULL;
-               outrun = tree_run;
-               outfree = NULL;
-               break;
-       case (OUTT_LINT):
-               outdata = NULL;
-               outrun = NULL;
-               outfree = NULL;
-               break;
-       default:
-               outdata = ascii_alloc();
-               outrun = terminal_run;
-               outfree = terminal_free;
-               break;
-       }
-
-       /*
-        * All callbacks route into here, where we print them onto the
-        * screen.  XXX - for now, no path for debugging messages.
-        */
+       argc -= optind;
+       argv += optind;

 
 

-       mdoccb.mdoc_msg = NULL;
-       mdoccb.mdoc_err = merr;
-       mdoccb.mdoc_warn = mdocwarn;
-
-       mancb.man_err = merr;
-       mancb.man_warn = manwarn;
-
-       bzero(&ln, sizeof(struct buf));
-       bzero(&blk, sizeof(struct buf));
-
-       man = NULL;
-       mdoc = NULL;
-       pflags = 0;
-
-       switch (inttype) {
-       case (INTT_MAN):
-               if (fflags & IGN_MACRO)
-                       pflags |= MAN_IGN_MACRO;
-
-               man = man_alloc(&curp, pflags, &mancb);
-               break;
-       default:
-               if (fflags & IGN_SCOPE)
-                       pflags |= MDOC_IGN_SCOPE;
-               if (fflags & IGN_ESCAPE)
-                       pflags |= MDOC_IGN_ESCAPE;
-               if (fflags & IGN_MACRO)
-                       pflags |= MDOC_IGN_MACRO;
-
-               mdoc = mdoc_alloc(&curp, pflags, &mdoccb);
-               break;
-       }
+       rc = MANDOCLEVEL_OK;

 
 

-       /*
-        * Loop around available files.
-        */
+       if (NULL == *argv)
+               parse(&curp, STDIN_FILENO, "<stdin>", &rc);

 
 

-       if (NULL == *argv) {
-               curp.file = "<stdin>";
-               rc = 0;
-               c = fdesc(&blk, &ln, "stdin", 
-                               STDIN_FILENO, man, mdoc);
-
-               if (c && NULL == outrun)
-                       rc = 1;
-               else if (c && outrun && (*outrun)(outdata, man, mdoc))
-                       rc = 1;
-       } else {
-               while (*argv) {
-                       curp.file = *argv;
-                       c = file(&blk, &ln, *argv, man, mdoc);
-                       if ( ! c)
-                               break;
-                       if (outrun && ! (*outrun)(outdata, man, mdoc))
-                               break;
-                       if (man)
-                               man_reset(man);
-                       if (mdoc)
-                               mdoc_reset(mdoc);
-
-                       argv++;
-               }
-               rc = NULL == *argv;
+       while (*argv) {
+               parse(&curp, -1, *argv, &rc);
+               if (MANDOCLEVEL_OK != rc && curp.wstop)
+                       break;
+               ++argv;

        }
 
        }
 

-       if (blk.buf)
-               free(blk.buf);
-       if (ln.buf)
-               free(ln.buf);
-       if (outfree)
-               (*outfree)(outdata);
-       if (mdoc)
-               mdoc_free(mdoc);
-       if (man)
-               man_free(man);
-
-       return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
-}
+       if (curp.outfree)
+               (*curp.outfree)(curp.outdata);
+       if (curp.mp)
+               mparse_free(curp.mp);
+       free(defos);

 
 

+       return((int)rc);
+}

 
 

-__dead static void
+static void

 version(void)
 {
 
 version(void)
 {
 

-       (void)printf("%s %s\n", __progname, VERSION);
-       exit(0);
-       /* NOTREACHED */
+       printf("%s %s\n", progname, VERSION);
+       exit((int)MANDOCLEVEL_OK);

 }
 
 }
 

-
-__dead static void
+static void

 usage(void)
 {
 
 usage(void)
 {
 

-       (void)fprintf(stderr, "usage: %s [-V] [-foption...] "
-                       "[-mformat] [-Toutput] [-Werr...]\n", 
-                       __progname);
-       exit(1);
-       /* NOTREACHED */
+       fprintf(stderr, "usage: %s "
+                       "[-V] "
+                       "[-Ios=name] "
+                       "[-mformat] "
+                       "[-Ooption] "
+                       "[-Toutput] "
+                       "[-Wlevel]\n"
+                       "\t      [file ...]\n",
+                       progname);
+
+       exit((int)MANDOCLEVEL_BADARG);

 }
 
 }
 

-
-static int
-file(struct buf *blk, struct buf *ln, const char *file, 
-               struct man *man, struct mdoc *mdoc)
+static void
+parse(struct curparse *curp, int fd, const char *file,
+       enum mandoclevel *level)

 {
 {

-       int              fd, c;
+       enum mandoclevel  rc;
+       struct mdoc      *mdoc;
+       struct man       *man;

 
 

-       if (-1 == (fd = open(file, O_RDONLY, 0))) {
-               warn("%s", file);
-               return(0);
-       }
+       /* Begin by parsing the file itself. */

 
 

-       c = fdesc(blk, ln, file, fd, man, mdoc);
+       assert(file);
+       assert(fd >= -1);

 
 

-       if (-1 == close(fd))
-               warn("%s", file);
-
-       return(c);
-}
+       rc = mparse_readfd(curp->mp, fd, file);

 
 

+       /* Stop immediately if the parse has failed. */

 
 

-static int
-fdesc(struct buf *blk, struct buf *ln,
-               const char *f, int fd, 
-               struct man *man, struct mdoc *mdoc)
-{
-       size_t           sz;
-       ssize_t          ssz;
-       struct stat      st;
-       int              j, i, pos, lnn;
-
-       assert( ! (man && mdoc));
+       if (MANDOCLEVEL_FATAL <= rc)
+               goto cleanup;

 
        /*
 
        /*

-        * Two buffers: ln and buf.  buf is the input buffer, optimised
-        * for each file's block size.  ln is a line buffer.  Both
-        * growable, hence passed in by ptr-ptr.
+        * With -Wstop and warnings or errors of at least the requested
+        * level, do not produce output.

         */
 
         */
 

-       sz = BUFSIZ;
-
-       if (-1 == fstat(fd, &st))
-               warnx("%s", f);
-       else if ((size_t)st.st_blksize > sz)
-               sz = st.st_blksize;
+       if (MANDOCLEVEL_OK != rc && curp->wstop)
+               goto cleanup;

 
 

-       if (sz > blk->sz) {
-               blk->buf = realloc(blk->buf, sz);
-               if (NULL == blk->buf)
-                       err(1, "realloc");
-               blk->sz = sz;
-       }
+       /* If unset, allocate output dev now (if applicable). */

 
 

-       /*
-        * Fill buf with file blocksize and parse newlines into ln.
-        */
-
-       for (lnn = 1, pos = 0; ; ) {
-               if (-1 == (ssz = read(fd, blk->buf, sz))) {
-                       warn("%s", f);
-                       return(0);
-               } else if (0 == ssz) 
+       if ( ! (curp->outman && curp->outmdoc)) {
+               switch (curp->outtype) {
+               case OUTT_XHTML:
+                       curp->outdata = xhtml_alloc(curp->outopts);
+                       curp->outfree = html_free;

                        break;
                        break;

+               case OUTT_HTML:
+                       curp->outdata = html_alloc(curp->outopts);
+                       curp->outfree = html_free;
+                       break;
+               case OUTT_UTF8:
+                       curp->outdata = utf8_alloc(curp->outopts);
+                       curp->outfree = ascii_free;
+                       break;
+               case OUTT_LOCALE:
+                       curp->outdata = locale_alloc(curp->outopts);
+                       curp->outfree = ascii_free;
+                       break;
+               case OUTT_ASCII:
+                       curp->outdata = ascii_alloc(curp->outopts);
+                       curp->outfree = ascii_free;
+                       break;
+               case OUTT_PDF:
+                       curp->outdata = pdf_alloc(curp->outopts);
+                       curp->outfree = pspdf_free;
+                       break;
+               case OUTT_PS:
+                       curp->outdata = ps_alloc(curp->outopts);
+                       curp->outfree = pspdf_free;
+                       break;
+               default:
+                       break;
+               }

 
 

-               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)
-                                       err(1, "realloc");
-                       }
-
-                       if ('\n' != blk->buf[i]) {
-                               ln->buf[pos++] = blk->buf[i];
-                               continue;
-                       }
+               switch (curp->outtype) {
+               case OUTT_HTML:
+                       /* FALLTHROUGH */
+               case OUTT_XHTML:
+                       curp->outman = html_man;
+                       curp->outmdoc = html_mdoc;
+                       break;
+               case OUTT_TREE:
+                       curp->outman = tree_man;
+                       curp->outmdoc = tree_mdoc;
+                       break;
+               case OUTT_MAN:
+                       curp->outmdoc = man_mdoc;
+                       curp->outman = man_man;
+                       break;
+               case OUTT_PDF:
+                       /* FALLTHROUGH */
+               case OUTT_ASCII:
+                       /* FALLTHROUGH */
+               case OUTT_UTF8:
+                       /* FALLTHROUGH */
+               case OUTT_LOCALE:
+                       /* FALLTHROUGH */
+               case OUTT_PS:
+                       curp->outman = terminal_man;
+                       curp->outmdoc = terminal_mdoc;
+                       break;
+               default:
+                       break;
+               }
+       }

 
 

-                       /* Check for CPP-escaped newline.  */
+       mparse_result(curp->mp, &mdoc, &man, NULL);

 
 

-                       if (pos > 0 && '\\' == ln->buf[pos - 1]) {
-                               for (j = pos - 1; j >= 0; j--)
-                                       if ('\\' != ln->buf[j])
-                                               break;
+       /* Execute the out device, if it exists. */

 
 

-                               if ( ! ((pos - j) % 2)) {
-                                       pos--;
-                                       lnn++;
-                                       continue;
-                               }
-                       }
+       if (man && curp->outman)
+               (*curp->outman)(curp->outdata, man);
+       if (mdoc && curp->outmdoc)
+               (*curp->outmdoc)(curp->outdata, mdoc);

 
 

-                       ln->buf[pos] = 0;
-                       if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf))
-                               return(0);
-                       if (man && ! man_parseln(man, lnn, ln->buf))
-                               return(0);
-                       lnn++;
-                       pos = 0;
-               }
-       }
+ cleanup:

 
 

-       if (mdoc)
-              return(mdoc_endparse(mdoc));
+       mparse_reset(curp->mp);

 
 

-       return(man_endparse(man));
+       if (*level < rc)
+               *level = rc;

 }
 
 }
 

-

 static int
 static int

-moptions(enum intt *tflags, char *arg)
+moptions(int *options, char *arg)

 {
 
 {
 

-       if (0 == strcmp(arg, "mdoc"))
-               *tflags = INTT_MDOC;
-       else if (0 == strcmp(arg, "man"))
-               *tflags = INTT_MAN;
+       if (0 == strcmp(arg, "doc"))
+               *options |= MPARSE_MDOC;
+       else if (0 == strcmp(arg, "andoc"))
+               /* nothing to do */;
+       else if (0 == strcmp(arg, "an"))
+               *options |= MPARSE_MAN;

        else {
        else {

-               warnx("bad argument: -m%s", arg);
+               fprintf(stderr, "%s: -m%s: Bad argument\n",
+                   progname, arg);

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

-

 static int
 static int

-toptions(enum outt *tflags, char *arg)
+toptions(struct curparse *curp, char *arg)

 {
 
        if (0 == strcmp(arg, "ascii"))
 {
 
        if (0 == strcmp(arg, "ascii"))

-               *tflags = OUTT_ASCII;
-       else if (0 == strcmp(arg, "latin1"))
-               *tflags = OUTT_LATIN1;
+               curp->outtype = OUTT_ASCII;
+       else if (0 == strcmp(arg, "lint")) {
+               curp->outtype = OUTT_LINT;
+               curp->wlevel  = MANDOCLEVEL_WARNING;
+       } else if (0 == strcmp(arg, "tree"))
+               curp->outtype = OUTT_TREE;
+       else if (0 == strcmp(arg, "man"))
+               curp->outtype = OUTT_MAN;
+       else if (0 == strcmp(arg, "html"))
+               curp->outtype = OUTT_HTML;

        else if (0 == strcmp(arg, "utf8"))
        else if (0 == strcmp(arg, "utf8"))

-               *tflags = OUTT_UTF8;
-       else if (0 == strcmp(arg, "lint"))
-               *tflags = OUTT_LINT;
-       else if (0 == strcmp(arg, "tree"))
-               *tflags = OUTT_TREE;
+               curp->outtype = OUTT_UTF8;
+       else if (0 == strcmp(arg, "locale"))
+               curp->outtype = OUTT_LOCALE;
+       else if (0 == strcmp(arg, "xhtml"))
+               curp->outtype = OUTT_XHTML;
+       else if (0 == strcmp(arg, "ps"))
+               curp->outtype = OUTT_PS;
+       else if (0 == strcmp(arg, "pdf"))
+               curp->outtype = OUTT_PDF;

        else {
        else {

-               warnx("bad argument: -T%s", arg);
+               fprintf(stderr, "%s: -T%s: Bad argument\n",
+                   progname, arg);

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

-
-/*
- * Parse out the options for [-fopt...] setting compiler options.  These
- * can be comma-delimited or called again.
- */
-static int
-foptions(int *fflags, char *arg)
-{
-       char            *v;
-       char            *toks[4];
-
-       toks[0] = "ign-scope";
-       toks[1] = "ign-escape";
-       toks[2] = "ign-macro";
-       toks[3] = NULL;
-
-       while (*arg) 
-               switch (getsubopt(&arg, toks, &v)) {
-               case (0):
-                       *fflags |= IGN_SCOPE;
-                       break;
-               case (1):
-                       *fflags |= IGN_ESCAPE;
-                       break;
-               case (2):
-                       *fflags |= IGN_MACRO;
-                       break;
-               default:
-                       warnx("bad argument: -f%s", arg);
-                       return(0);
-               }
-
-       return(1);
-}
-
-
-/* 
- * Parse out the options for [-Werr...], which sets warning modes.
- * These can be comma-delimited or called again.  
- */

 static int
 static int

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

 {
 {

-       char            *v;
-       char            *toks[5]; 
+       char            *v, *o;
+       const char      *toks[6];

 
 

-       toks[0] = "all";
-       toks[1] = "compat";
-       toks[2] = "syntax";
+       toks[0] = "stop";
+       toks[1] = "all";
+       toks[2] = "warning";

        toks[3] = "error";
        toks[3] = "error";

-       toks[4] = NULL;
-
-       while (*arg) 
-               switch (getsubopt(&arg, toks, &v)) {
-               case (0):
-                       *wflags |= WARN_WALL;
+       toks[4] = "fatal";
+       toks[5] = NULL;
+
+       while (*arg) {
+               o = arg;
+               switch (getsubopt(&arg, UNCONST(toks), &v)) {
+               case 0:
+                       curp->wstop = 1;

                        break;
                        break;

-               case (1):
-                       *wflags |= WARN_WCOMPAT;
+               case 1:
+                       /* FALLTHROUGH */
+               case 2:
+                       curp->wlevel = MANDOCLEVEL_WARNING;

                        break;
                        break;

-               case (2):
-                       *wflags |= WARN_WSYNTAX;
+               case 3:
+                       curp->wlevel = MANDOCLEVEL_ERROR;

                        break;
                        break;

-               case (3):
-                       *wflags |= WARN_WERR;
+               case 4:
+                       curp->wlevel = MANDOCLEVEL_FATAL;

                        break;
                default:
                        break;
                default:

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

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

-
-       return(1);
-}
-
-
-/* ARGSUSED */
-static int
-merr(void *arg, int line, int col, const char *msg)
-{
-       struct curparse *curp;
-
-       curp = (struct curparse *)arg;
-
-       warnx("%s:%d: error: %s (column %d)", 
-                       curp->file, line, msg, col);
-       return(0);
-}
-
-
-static int
-mdocwarn(void *arg, int line, int col, 
-               enum mdoc_warn type, const char *msg)
-{
-       struct curparse *curp;
-       char            *wtype;
-
-       curp = (struct curparse *)arg;
-       wtype = NULL;
-
-       switch (type) {
-       case (WARN_COMPAT):
-               wtype = "compat";
-               if (curp->wflags & WARN_WCOMPAT)
-                       break;
-               return(1);
-       case (WARN_SYNTAX):
-               wtype = "syntax";
-               if (curp->wflags & WARN_WSYNTAX)
-                       break;
-               return(1);

        }
 
        }
 

-       assert(wtype);
-       warnx("%s:%d: %s warning: %s (column %d)", 
-                       curp->file, line, wtype, msg, col);
-
-       if ( ! (curp->wflags & WARN_WERR))
-               return(1);
-
-       warnx("%s: considering warnings as errors", 
-                       __progname);
-       return(0);
+       return(1);

 }
 
 }
 

-
-static int
-manwarn(void *arg, int line, int col, const char *msg)
+static void
+mmsg(enum mandocerr t, enum mandoclevel lvl,
+               const char *file, int line, int col, const char *msg)

 {
 {

-       struct curparse *curp;

 
 

-       curp = (struct curparse *)arg;
+       fprintf(stderr, "%s: %s:", progname, file);

 
 

-       if ( ! (curp->wflags & WARN_WSYNTAX))
-               return(1);
+       if (line)
+               fprintf(stderr, "%d:%d:", line, col + 1);

 
 

-       warnx("%s:%d: syntax warning: %s (column %d)", 
-                       curp->file, line, msg, col);
+       fprintf(stderr, " %s: %s", mparse_strlevel(lvl),
+           mparse_strerror(t));

 
 

-       if ( ! (curp->wflags & WARN_WERR))
-               return(1);
+       if (msg)
+               fprintf(stderr, ": %s", msg);

 
 

-       warnx("%s: considering warnings as errors", 
-                       __progname);
-       return(0);
+       fputc('\n', stderr);

 }
 }