===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.54
retrieving revision 1.59
diff -u -p -r1.54 -r1.59
--- mandoc/main.c	2009/10/31 06:17:19	1.54
+++ mandoc/main.c	2010/01/29 14:39:38	1.59
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.54 2009/10/31 06:17:19 kristaps Exp $ */
+/*	$Id: main.c,v 1.59 2010/01/29 14:39:38 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * 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/stat.h>
 
 #include <assert.h>
@@ -30,19 +34,13 @@
 
 #define	UNCONST(a)	((void *)(uintptr_t)(const void *)(a))
 
-/* Account for FreeBSD and Linux in our declarations. */
+/* FIXME: Intel's compiler?  LLVM?  pcc?  */
 
-#ifdef __linux__
-extern	int		  getsubopt(char **, char * const *, char **);
-extern	size_t	  	  strlcat(char *, const char *, size_t);
-# ifndef __dead
-#  define __dead __attribute__((__noreturn__))
+#if !defined(__GNUC__) || (__GNUC__ < 2)
+# if !defined(lint)
+#  define __attribute__(x)
 # endif
-#elif defined(__dead2)
-# ifndef __dead
-#  define __dead __dead2
-# endif
-#endif
+#endif /* !defined(__GNUC__) || (__GNUC__ < 2) */
 
 typedef	void		(*out_mdoc)(void *, const struct mdoc *);
 typedef	void		(*out_man)(void *, const struct man *);
@@ -63,6 +61,7 @@ enum	outt {
 	OUTT_ASCII = 0,
 	OUTT_TREE,
 	OUTT_HTML,
+	OUTT_XHTML,
 	OUTT_LINT
 };
 
@@ -105,8 +104,8 @@ 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	void		  version(void) __attribute__((noreturn));
+static	void		  usage(void) __attribute__((noreturn));
 
 static	const char	 *progname;
 
@@ -212,7 +211,7 @@ main(int argc, char *argv[])
 }
 
 
-__dead static void
+static void
 version(void)
 {
 
@@ -221,7 +220,7 @@ version(void)
 }
 
 
-__dead static void
+static void
 usage(void)
 {
 
@@ -430,6 +429,12 @@ fdesc(struct buf *blk, struct buf *ln, struct curparse
 
 	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;
@@ -532,7 +537,7 @@ moptions(enum intt *tflags, char *arg)
 	else if (0 == strcmp(arg, "an"))
 		*tflags = INTT_MAN;
 	else {
-		fprintf(stderr, "%s: Bad argument", arg);
+		fprintf(stderr, "%s: Bad argument\n", arg);
 		return(0);
 	}
 
@@ -552,8 +557,10 @@ toptions(enum outt *tflags, char *arg)
 		*tflags = OUTT_TREE;
 	else if (0 == strcmp(arg, "html"))
 		*tflags = OUTT_HTML;
+	else if (0 == strcmp(arg, "xhtml"))
+		*tflags = OUTT_XHTML;
 	else {
-		fprintf(stderr, "%s: Bad argument", arg);
+		fprintf(stderr, "%s: Bad argument\n", arg);
 		return(0);
 	}
 
@@ -602,7 +609,7 @@ foptions(int *fflags, char *arg)
 			*fflags &= ~NO_IGN_ESCAPE;
 			break;
 		default:
-			fprintf(stderr, "%s: Bad argument", o);
+			fprintf(stderr, "%s: Bad argument\n", o);
 			return(0);
 		}
 	}
@@ -631,7 +638,7 @@ woptions(int *wflags, char *arg)
 			*wflags |= WARN_WERR;
 			break;
 		default:
-			fprintf(stderr, "%s: Bad argument", o);
+			fprintf(stderr, "%s: Bad argument\n", o);
 			return(0);
 		}
 	}