===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.36
retrieving revision 1.69
diff -u -p -r1.36 -r1.69
--- mandoc/main.c	2009/07/06 09:34:29	1.36
+++ mandoc/main.c	2010/05/15 16:18:23	1.69
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.36 2009/07/06 09:34:29 kristaps Exp $ */
+/*	$Id: main.c,v 1.69 2010/05/15 16:18:23 joerg Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,34 +14,37 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <sys/mman.h>
 #include <sys/stat.h>
 
 #include <assert.h>
-#include <err.h>
 #include <fcntl.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "mdoc.h"
 #include "man.h"
+#include "main.h"
 
-/* Account for FreeBSD and Linux in our declarations. */
+#define	UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
 
-#ifdef __linux__
-extern	int		  getsubopt(char **, char * const *, char **);
-# ifndef __dead
-#  define __dead __attribute__((__noreturn__))
+/* FIXME: Intel's compiler?  LLVM?  pcc?  */
+
+#if !defined(__GNUC__) || (__GNUC__ < 2)
+# if !defined(lint)
+#  define __attribute__(x)
 # endif
-#elif defined(__dead2)
-# ifndef __dead
-#  define __dead __dead2
-# endif
-#endif
+#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
-typedef	int		(*out_mdoc)(void *, const struct mdoc *);
-typedef	int		(*out_man)(void *, const struct man *);
+typedef	void		(*out_mdoc)(void *, const struct mdoc *);
+typedef	void		(*out_man)(void *, const struct man *);
 typedef	void		(*out_free)(void *);
 
 struct	buf {
@@ -58,6 +61,8 @@ enum	intt {
 enum	outt {
 	OUTT_ASCII = 0,
 	OUTT_TREE,
+	OUTT_HTML,
+	OUTT_XHTML,
 	OUTT_LINT
 };
 
@@ -68,64 +73,61 @@ struct	curparse {
 #define	WARN_WALL	 (1 << 0)	/* All-warnings mask. */
 #define	WARN_WERR	 (1 << 2)	/* Warnings->errors. */
 	int		  fflags;
-#define	IGN_SCOPE	 (1 << 0) 	/* Ignore scope errors. */
-#define	NO_IGN_ESCAPE	 (1 << 1) 	/* Don't ignore bad escapes. */
-#define	NO_IGN_MACRO	 (1 << 2) 	/* Don't ignore bad macros. */
-#define	NO_IGN_CHARS	 (1 << 3)	/* Don't ignore bad chars. */
+#define	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 man	 *lastman;
 	struct mdoc	 *mdoc;
-	struct mdoc	 *lastmdoc;
 	enum outt	  outtype;	/* Output devices... */
 	out_mdoc	  outmdoc;
 	out_man	  	  outman;
 	out_free	  outfree;
 	void		 *outdata;
+	char		  outopts[BUFSIZ];
 };
 
-extern	void		 *ascii_alloc(void);
-extern	int		  tree_mdoc(void *, const struct mdoc *);
-extern	int		  tree_man(void *, const struct man *);
-extern	int		  terminal_mdoc(void *, const struct mdoc *);
-extern	int		  terminal_man(void *, const struct man *);
-extern	void		  terminal_free(void *);
-
+static	void		  fdesc(struct curparse *);
+static	void		  ffile(const char *, struct curparse *);
 static	int		  foptions(int *, char *);
-static	int		  toptions(enum outt *, char *);
-static	int		  moptions(enum intt *, char *);
-static	int		  woptions(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		  manwarn(void *, int, int, const char *);
-static	int		  mdocwarn(void *, int, int, const char *);
-static	int		  ffile(struct buf *, struct buf *, 
-				const char *, struct curparse *);
-static	int		  fdesc(struct buf *, struct buf *,
-				struct curparse *);
+static	int		  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	struct man	 *man_init(struct curparse *);
-static	struct mdoc	 *mdoc_init(struct curparse *);
-__dead	static void	  version(void);
-__dead	static void	  usage(void);
+static	int		  toptions(struct curparse *, char *);
+static	void		  usage(void) __attribute__((noreturn));
+static	void		  version(void) __attribute__((noreturn));
+static	int		  woptions(int *, char *);
 
-extern	char		 *__progname;
+static	const char	 *progname;
+static 	int		  with_error;
+static	int		  with_warning;
 
-
 int
 main(int argc, char *argv[])
 {
-	int		 c, rc;
-	struct buf	 ln, blk;
+	int		 c;
 	struct curparse	 curp;
 
-	bzero(&curp, sizeof(struct curparse));
+	progname = strrchr(argv[0], '/');
+	if (progname == NULL)
+		progname = argv[0];
+	else
+		++progname;
 
+	memset(&curp, 0, sizeof(struct curparse));
+
 	curp.inttype = INTT_AUTO;
 	curp.outtype = OUTT_ASCII;
 
 	/* LINTED */
-	while (-1 != (c = getopt(argc, argv, "f:m:VW:T:")))
+	while (-1 != (c = getopt(argc, argv, "f:m:O:T:VW:")))
 		switch (c) {
 		case ('f'):
 			if ( ! foptions(&curp.fflags, optarg))
@@ -135,8 +137,12 @@ main(int argc, char *argv[])
 			if ( ! moptions(&curp.inttype, optarg))
 				return(EXIT_FAILURE);
 			break;
+		case ('O'):
+			(void)strlcat(curp.outopts, optarg, BUFSIZ);
+			(void)strlcat(curp.outopts, ",", BUFSIZ);
+			break;
 		case ('T'):
-			if ( ! toptions(&curp.outtype, optarg))
+			if ( ! toptions(&curp, optarg))
 				return(EXIT_FAILURE);
 			break;
 		case ('W'):
@@ -154,65 +160,45 @@ main(int argc, char *argv[])
 	argc -= optind;
 	argv += optind;
 
-	bzero(&ln, sizeof(struct buf));
-	bzero(&blk, sizeof(struct buf));
-
-	rc = 1;
-
 	if (NULL == *argv) {
 		curp.file = "<stdin>";
 		curp.fd = STDIN_FILENO;
-		if ( ! fdesc(&blk, &ln, &curp))
-			rc = 0;
+
+		fdesc(&curp);
 	}
 
-	while (rc && *argv) {
-		if ( ! ffile(&blk, &ln, *argv, &curp))
-			rc = 0;
-		argv++;
-		if (*argv && rc) {
-			if (curp.lastman)
-				if ( ! man_reset(curp.lastman))
-					rc = 0;
-			if (curp.lastmdoc)
-				if ( ! mdoc_reset(curp.lastmdoc))
-					rc = 0;
-			curp.lastman = NULL;
-			curp.lastmdoc = NULL;
-		}
+	while (*argv) {
+		ffile(*argv, &curp);
+
+		if (with_error && !(curp.fflags & FL_IGN_ERRORS))
+			break;
+		++argv;
 	}
 
-	if (blk.buf)
-		free(blk.buf);
-	if (ln.buf)
-		free(ln.buf);
 	if (curp.outfree)
 		(*curp.outfree)(curp.outdata);
-	if (curp.mdoc)
-		mdoc_free(curp.mdoc);
-	if (curp.man)
-		man_free(curp.man);
 
-	return(rc ? EXIT_SUCCESS : EXIT_FAILURE);
+	return((with_warning || with_error) ? 
+			EXIT_FAILURE :  EXIT_SUCCESS);
 }
 
 
-__dead static void
+static void
 version(void)
 {
 
-	(void)printf("%s %s\n", __progname, VERSION);
+	(void)printf("%s %s\n", progname, VERSION);
 	exit(EXIT_SUCCESS);
 }
 
 
-__dead static void
+static void
 usage(void)
 {
 
-	(void)fprintf(stderr, "usage: %s [-V] [-foption...] "
-			"[-mformat] [-Toutput] [-Werr...]\n", 
-			__progname);
+	(void)fprintf(stderr, "usage: %s [-V] [-foption] "
+			"[-mformat] [-Ooption] [-Toutput] "
+			"[-Werr] [file...]\n", progname);
 	exit(EXIT_FAILURE);
 }
 
@@ -221,27 +207,21 @@ static struct man *
 man_init(struct curparse *curp)
 {
 	int		 pflags;
-	struct man	*man;
 	struct man_cb	 mancb;
 
 	mancb.man_err = merr;
-	mancb.man_warn = manwarn;
+	mancb.man_warn = mwarn;
 
 	/* Defaults from mandoc.1. */
 
-	pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS;
+	pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE;
 
-	if (curp->fflags & NO_IGN_MACRO)
+	if (curp->fflags & FL_NIGN_MACRO)
 		pflags &= ~MAN_IGN_MACRO;
-	if (curp->fflags & NO_IGN_CHARS)
-		pflags &= ~MAN_IGN_CHARS;
-	if (curp->fflags & NO_IGN_ESCAPE)
+	if (curp->fflags & FL_NIGN_ESCAPE)
 		pflags &= ~MAN_IGN_ESCAPE;
 
-	if (NULL == (man = man_alloc(curp, pflags, &mancb)))
-		warnx("memory exhausted");
-
-	return(man);
+	return(man_alloc(curp, pflags, &mancb));
 }
 
 
@@ -249,66 +229,149 @@ static struct mdoc *
 mdoc_init(struct curparse *curp)
 {
 	int		 pflags;
-	struct mdoc	*mdoc;
 	struct mdoc_cb	 mdoccb;
 
 	mdoccb.mdoc_err = merr;
-	mdoccb.mdoc_warn = mdocwarn;
+	mdoccb.mdoc_warn = mwarn;
 
 	/* Defaults from mandoc.1. */
 
-	pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS;
+	pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE;
 
-	if (curp->fflags & IGN_SCOPE)
+	if (curp->fflags & FL_IGN_SCOPE)
 		pflags |= MDOC_IGN_SCOPE;
-	if (curp->fflags & NO_IGN_ESCAPE)
+	if (curp->fflags & FL_NIGN_ESCAPE)
 		pflags &= ~MDOC_IGN_ESCAPE;
-	if (curp->fflags & NO_IGN_MACRO)
+	if (curp->fflags & FL_NIGN_MACRO)
 		pflags &= ~MDOC_IGN_MACRO;
-	if (curp->fflags & NO_IGN_CHARS)
-		pflags &= ~MDOC_IGN_CHARS;
 
-	if (NULL == (mdoc = mdoc_alloc(curp, pflags, &mdoccb)))
-		warnx("memory exhausted");
-
-	return(mdoc);
+	return(mdoc_alloc(curp, pflags, &mdoccb));
 }
 
 
-static int
-ffile(struct buf *blk, struct buf *ln, 
-		const char *file, struct curparse *curp)
+static void
+ffile(const char *file, struct curparse *curp)
 {
-	int		 c;
 
 	curp->file = file;
 	if (-1 == (curp->fd = open(curp->file, O_RDONLY, 0))) {
-		warn("%s", curp->file);
-		return(0);
+		perror(curp->file);
+		with_error = 1;
+		return;
 	}
 
-	c = fdesc(blk, ln, curp);
+	fdesc(curp);
 
 	if (-1 == close(curp->fd))
-		warn("%s", curp->file);
+		perror(curp->file);
+}
 
-	return(c);
+
+static int
+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) {
+		perror(NULL);
+		return(0);
+	}
+	buf->buf = tmp;
+	buf->sz = sz;
+	return(1);
 }
 
 
 static int
-fdesc(struct buf *blk, struct buf *ln, struct curparse *curp)
+read_whole_file(struct curparse *curp, struct buf *fb, int *with_mmap)
 {
-	size_t		 sz;
-	ssize_t		 ssz;
 	struct stat	 st;
-	int		 j, i, pos, lnn, comment;
+	size_t		 off;
+	ssize_t		 ssz;
+
+	if (-1 == fstat(curp->fd, &st)) {
+		perror(curp->file);
+		with_error = 1;
+		return(0);
+	}
+
+	/*
+	 * If we're a regular file, try just reading in the whole entry
+	 * via mmap().  This is faster than reading it into blocks, and
+	 * since each file is only a few bytes to begin with, I'm not
+	 * concerned that this is going to tank any machines.
+	 */
+
+	if (S_ISREG(st.st_mode)) {
+		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->buf = mmap(NULL, fb->sz, PROT_READ, 
+				MAP_FILE, curp->fd, 0);
+		if (fb->buf != MAP_FAILED)
+			return(1);
+	}
+
+	/*
+	 * If this isn't a regular file (like, say, stdin), then we must
+	 * go the old way and just read things in bit by bit.
+	 */
+
+	*with_mmap = 0;
+	off = 0;
+	fb->sz = 0;
+	fb->buf = NULL;
+	for (;;) {
+		if (off == fb->sz) {
+			if (fb->sz == (1U << 31)) {
+				fprintf(stderr, "%s: input too large\n", 
+						curp->file);
+				break;
+			}
+			if (! resize_buf(fb, 65536))
+				break;
+		}
+		ssz = read(curp->fd, fb->buf + off, fb->sz - off);
+		if (ssz == 0) {
+			fb->sz = off;
+			return(1);
+		}
+		if (ssz == -1) {
+			perror(curp->file);
+			break;
+		}
+		off += ssz;
+	}
+
+	free(fb->buf);
+	fb->buf = NULL;
+	with_error = 1;
+	return(0);
+}
+
+
+static void
+fdesc(struct curparse *curp)
+{
+	struct buf	 ln, blk;
+	int		 j, i, pos, lnn, comment, with_mmap;
 	struct man	*man;
 	struct mdoc	*mdoc;
 
-	sz = BUFSIZ;
 	man = NULL;
 	mdoc = NULL;
+	memset(&ln, 0, sizeof(struct buf));
 
 	/*
 	 * Two buffers: ln and buf.  buf is the input buffer optimised
@@ -316,113 +379,104 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 	 * growable, hence passed in by ptr-ptr.
 	 */
 
-	if (-1 == fstat(curp->fd, &st))
-		warn("%s", curp->file);
-	else if ((size_t)st.st_blksize > sz)
-		sz = st.st_blksize;
+	if (!read_whole_file(curp, &blk, &with_mmap))
+		return;
 
-	if (sz > blk->sz) {
-		blk->buf = realloc(blk->buf, sz);
-		if (NULL == blk->buf) {
-			warn("realloc");
-			return(0);
-		}
-		blk->sz = sz;
-	}
-
 	/* Fill buf with file blocksize. */
 
-	for (lnn = pos = comment = 0; ; ) {
-		if (-1 == (ssz = read(curp->fd, blk->buf, sz))) {
-			warn("%s", curp->file);
-			return(0);
-		} else if (0 == ssz) 
-			break;
+	for (i = lnn = pos = comment = 0; i < (int)blk.sz; ++i) {
+		if (pos >= (int)ln.sz) {
+			if (! resize_buf(&ln, 256))
+				goto bailout;
+		}
 
-		/* Parse the read block into partial or full lines. */
+		if ('\n' != blk.buf[i]) {
+			if (comment)
+				continue;
+			ln.buf[pos++] = blk.buf[i];
 
-		for (i = 0; i < (int)ssz; i++) {
-			if (pos >= (int)ln->sz) {
-				ln->sz += 256; /* Step-size. */
-				ln->buf = realloc(ln->buf, ln->sz);
-				if (NULL == ln->buf) {
-					warn("realloc");
-					return(0);
-				}
-			}
+			/* Handle in-line `\"' comments. */
 
-			if ('\n' != blk->buf[i]) {
-				if (comment)
-					continue;
-				ln->buf[pos++] = blk->buf[i];
+			if (1 == pos || '\"' != ln.buf[pos - 1])
+				continue;
 
-				/* Handle in-line `\"' comments. */
+			for (j = pos - 2; j >= 0; j--)
+				if ('\\' != ln.buf[j])
+					break;
 
-				if (1 == pos || '\"' != ln->buf[pos - 1])
-					continue;
+			if ( ! ((pos - 2 - j) % 2))
+				continue;
 
-				for (j = pos - 2; j >= 0; j--)
-					if ('\\' != ln->buf[j])
-						break;
+			comment = 1;
+			pos -= 2;
+			for (; pos > 0; --pos) {
+				if (ln.buf[pos - 1] != ' ')
+					break;
+				if (pos > 2 && ln.buf[pos - 2] == '\\')
+					break;
+			}
+			continue;
+		} 
 
-				if ( ! ((pos - 2 - j) % 2))
-					continue;
+		/* Handle escaped `\\n' newlines. */
 
-				comment = 1;
-				pos -= 2;
+		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;
-			} 
-
-			/* Handle escaped `\\n' newlines. */
-
-			if (pos > 0 && 0 == comment && 
-					'\\' == ln->buf[pos - 1]) {
-				for (j = pos - 1; j >= 0; j--)
-					if ('\\' != ln->buf[j])
-						break;
-				if ( ! ((pos - j) % 2)) {
-					pos--;
-					lnn++;
-					continue;
-				}
 			}
+		}
 
-			ln->buf[pos] = 0;
-			lnn++;
+		ln.buf[pos] = 0;
+		lnn++;
 
-			/* If unset, assign parser in pset(). */
+		/* If unset, assign parser in pset(). */
 
-			if ( ! (man || mdoc) && ! pset(ln->buf, 
-						pos, curp, &man, &mdoc))
-				return(0);
+		if ( ! (man || mdoc) && ! pset(ln.buf, pos, curp, &man, &mdoc))
+			goto bailout;
 
-			pos = comment = 0;
+		pos = comment = 0;
 
-			/* Pass down into parsers. */
+		/* Pass down into parsers. */
 
-			if (man && ! man_parseln(man, lnn, ln->buf))
-				return(0);
-			if (mdoc && ! mdoc_parseln(mdoc, lnn, ln->buf))
-				return(0);
-		}
+		if (man && ! man_parseln(man, lnn, ln.buf))
+			goto bailout;
+		if (mdoc && ! mdoc_parseln(mdoc, lnn, ln.buf))
+			goto bailout;
 	}
 
 	/* NOTE a parser may not have been assigned, yet. */
 
 	if ( ! (man || mdoc)) {
-		warnx("%s: not a manual", curp->file);
-		return(0);
+		fprintf(stderr, "%s: Not a manual\n", curp->file);
+		goto bailout;
 	}
 
 	if (mdoc && ! mdoc_endparse(mdoc))
-		return(0);
+		goto bailout;
 	if (man && ! man_endparse(man))
-		return(0);
+		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);
+			curp->outman = html_man;
+			curp->outmdoc = html_mdoc;
+			curp->outfree = html_free;
+			break;
+		case (OUTT_HTML):
+			curp->outdata = html_alloc(curp->outopts);
+			curp->outman = html_man;
+			curp->outmdoc = html_mdoc;
+			curp->outfree = html_free;
+			break;
 		case (OUTT_TREE):
 			curp->outman = tree_man;
 			curp->outmdoc = tree_mdoc;
@@ -430,7 +484,7 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 		case (OUTT_LINT):
 			break;
 		default:
-			curp->outdata = ascii_alloc();
+			curp->outdata = ascii_alloc(80);
 			curp->outman = terminal_man;
 			curp->outmdoc = terminal_mdoc;
 			curp->outfree = terminal_free;
@@ -441,13 +495,30 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 	/* Execute the out device, if it exists. */
 
 	if (man && curp->outman)
-		if ( ! (*curp->outman)(curp->outdata, man))
-			return(0);
+		(*curp->outman)(curp->outdata, man);
 	if (mdoc && curp->outmdoc)
-		if ( ! (*curp->outmdoc)(curp->outdata, mdoc))
-			return(0);
+		(*curp->outmdoc)(curp->outdata, mdoc);
 
-	return(1);
+ cleanup:
+	if (curp->mdoc) {
+		mdoc_free(curp->mdoc);
+		curp->mdoc = NULL;
+	}
+	if (curp->man) {
+		man_free(curp->man);
+		curp->man = NULL;
+	}
+	if (ln.buf)
+		free(ln.buf);
+	if (with_mmap)
+		munmap(blk.buf, blk.sz);
+	else
+		free(blk.buf);
+	return;
+
+ bailout:
+	with_error = 1;
+	goto cleanup;
 }
 
 
@@ -479,14 +550,12 @@ pset(const char *buf, int pos, struct curparse *curp,
 			curp->mdoc = mdoc_init(curp);
 		if (NULL == (*mdoc = curp->mdoc))
 			return(0);
-		curp->lastmdoc = *mdoc;
 		return(1);
 	case (INTT_MAN):
 		if (NULL == curp->man) 
 			curp->man = man_init(curp);
 		if (NULL == (*man = curp->man))
 			return(0);
-		curp->lastman = *man;
 		return(1);
 	default:
 		break;
@@ -497,7 +566,6 @@ pset(const char *buf, int pos, struct curparse *curp,
 			curp->mdoc = mdoc_init(curp);
 		if (NULL == (*mdoc = curp->mdoc))
 			return(0);
-		curp->lastmdoc = *mdoc;
 		return(1);
 	} 
 
@@ -505,7 +573,6 @@ pset(const char *buf, int pos, struct curparse *curp,
 		curp->man = man_init(curp);
 	if (NULL == (*man = curp->man))
 		return(0);
-	curp->lastman = *man;
 	return(1);
 }
 
@@ -521,7 +588,7 @@ moptions(enum intt *tflags, char *arg)
 	else if (0 == strcmp(arg, "an"))
 		*tflags = INTT_MAN;
 	else {
-		warnx("bad argument: -m%s", arg);
+		fprintf(stderr, "%s: Bad argument\n", arg);
 		return(0);
 	}
 
@@ -530,17 +597,24 @@ moptions(enum intt *tflags, char *arg)
 
 
 static int
-toptions(enum outt *tflags, char *arg)
+toptions(struct curparse *curp, char *arg)
 {
 
 	if (0 == strcmp(arg, "ascii"))
-		*tflags = OUTT_ASCII;
-	else if (0 == strcmp(arg, "lint"))
-		*tflags = OUTT_LINT;
+		curp->outtype = OUTT_ASCII;
+	else if (0 == strcmp(arg, "lint")) {
+		curp->outtype = OUTT_LINT;
+		curp->wflags |= WARN_WALL;
+		curp->fflags |= FL_STRICT;
+	}
 	else if (0 == strcmp(arg, "tree"))
-		*tflags = OUTT_TREE;
+		curp->outtype = OUTT_TREE;
+	else if (0 == strcmp(arg, "html"))
+		curp->outtype = OUTT_HTML;
+	else if (0 == strcmp(arg, "xhtml"))
+		curp->outtype = OUTT_XHTML;
 	else {
-		warnx("bad argument: -T%s", arg);
+		fprintf(stderr, "%s: Bad argument\n", arg);
 		return(0);
 	}
 
@@ -552,36 +626,39 @@ static int
 foptions(int *fflags, char *arg)
 {
 	char		*v, *o;
-	char		*toks[6];
+	const char	*toks[8];
 
 	toks[0] = "ign-scope";
 	toks[1] = "no-ign-escape";
 	toks[2] = "no-ign-macro";
-	toks[3] = "no-ign-chars";
+	toks[3] = "ign-errors";
 	toks[4] = "strict";
-	toks[5] = NULL;
+	toks[5] = "ign-escape";
+	toks[6] = NULL;
 
 	while (*arg) {
 		o = arg;
-		switch (getsubopt(&arg, toks, &v)) {
+		switch (getsubopt(&arg, UNCONST(toks), &v)) {
 		case (0):
-			*fflags |= IGN_SCOPE;
+			*fflags |= FL_IGN_SCOPE;
 			break;
 		case (1):
-			*fflags |= NO_IGN_ESCAPE;
+			*fflags |= FL_NIGN_ESCAPE;
 			break;
 		case (2):
-			*fflags |= NO_IGN_MACRO;
+			*fflags |= FL_NIGN_MACRO;
 			break;
 		case (3):
-			*fflags |= NO_IGN_CHARS;
+			*fflags |= FL_IGN_ERRORS;
 			break;
 		case (4):
-			*fflags |= NO_IGN_ESCAPE | 
-			 	   NO_IGN_MACRO | NO_IGN_CHARS;
+			*fflags |= FL_STRICT;
 			break;
+		case (5):
+			*fflags &= ~FL_NIGN_ESCAPE;
+			break;
 		default:
-			warnx("bad argument: -f%s", o);
+			fprintf(stderr, "%s: Bad argument\n", o);
 			return(0);
 		}
 	}
@@ -594,7 +671,7 @@ static int
 woptions(int *wflags, char *arg)
 {
 	char		*v, *o;
-	char		*toks[3]; 
+	const char	*toks[3]; 
 
 	toks[0] = "all";
 	toks[1] = "error";
@@ -602,7 +679,7 @@ woptions(int *wflags, char *arg)
 
 	while (*arg) {
 		o = arg;
-		switch (getsubopt(&arg, toks, &v)) {
+		switch (getsubopt(&arg, UNCONST(toks), &v)) {
 		case (0):
 			*wflags |= WARN_WALL;
 			break;
@@ -610,7 +687,7 @@ woptions(int *wflags, char *arg)
 			*wflags |= WARN_WERR;
 			break;
 		default:
-			warnx("bad argument: -W%s", o);
+			fprintf(stderr, "%s: Bad argument\n", o);
 			return(0);
 		}
 	}
@@ -627,36 +704,17 @@ merr(void *arg, int line, int col, const char *msg)
 
 	curp = (struct curparse *)arg;
 
-	warnx("%s:%d: error: %s (column %d)", 
-			curp->file, line, msg, col);
+	(void)fprintf(stderr, "%s:%d:%d: error: %s\n", 
+			curp->file, line, col + 1, msg);
 
-	return(0);
-}
+	with_error = 1;
 
-
-static int
-mdocwarn(void *arg, int line, int col, const char *msg)
-{
-	struct curparse *curp;
-
-	curp = (struct curparse *)arg;
-
-	if ( ! (curp->wflags & WARN_WALL))
-		return(1);
-
-	warnx("%s:%d: syntax warning: %s (column %d)", 
-			curp->file, line, msg, col);
-
-	if ( ! (curp->wflags & WARN_WERR))
-		return(1);
-	
-	warnx("considering warnings as errors");
 	return(0);
 }
 
 
 static int
-manwarn(void *arg, int line, int col, const char *msg)
+mwarn(void *arg, int line, int col, const char *msg)
 {
 	struct curparse *curp;
 
@@ -665,12 +723,15 @@ manwarn(void *arg, int line, int col, const char *msg)
 	if ( ! (curp->wflags & WARN_WALL))
 		return(1);
 
-	warnx("%s:%d: syntax warning: %s (column %d)", 
-			curp->file, line, msg, col);
+	(void)fprintf(stderr, "%s:%d:%d: warning: %s\n", 
+			curp->file, line, col + 1, msg);
 
-	if ( ! (curp->wflags & WARN_WERR))
-		return(1);
+	with_warning = 1;
+	if (curp->wflags & WARN_WERR) {
+		with_error = 1;
+		return(0);
+	}
 
-	warnx("considering warnings as errors");
-	return(0);
+	return(1);
 }
+