===================================================================
RCS file: /cvs/mandoc/Attic/mdocml.c,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -p -r1.14 -r1.16
--- mandoc/Attic/mdocml.c	2008/11/28 11:21:12	1.14
+++ mandoc/Attic/mdocml.c	2008/12/03 19:21:58	1.16
@@ -1,4 +1,4 @@
-/* $Id: mdocml.c,v 1.14 2008/11/28 11:21:12 kristaps Exp $ */
+/* $Id: mdocml.c,v 1.16 2008/12/03 19:21:58 kristaps Exp $ */
 /*
  * Copyright (c) 2008 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -48,18 +48,21 @@ int
 main(int argc, char *argv[])
 {
 	int		 c;
-	char		*out, *in;
+	char		*out, *in, *filter;
 	struct md_args	 args;
 
 	extern char	*optarg;
 	extern int	 optind;
 
-	out = in = NULL;
+	out = in = filter = NULL;
 
 	(void)memset(&args, 0, sizeof(struct md_args));
 	
-	while (-1 != (c = getopt(argc, argv, "o:vW")))
+	while (-1 != (c = getopt(argc, argv, "f:o:vW")))
 		switch (c) {
+		case ('f'):
+			filter = optarg;
+			break;
 		case ('o'):
 			out = optarg;
 			break;
@@ -80,6 +83,16 @@ main(int argc, char *argv[])
 	if (1 == argc)
 		in = *argv++;
 
+	if (filter) {
+		if (0 == strcmp(filter, "html"))
+			args.type = MD_HTML;
+		else if (0 == strcmp(filter, "xml"))
+			args.type = MD_XML;
+		else
+			errx(1, "invalid filter type");
+	} else
+		args.type = MD_XML;
+
 	return(begin_io(&args, out ? out : "-", in ? in : "-"));
 }
 
@@ -106,6 +119,9 @@ leave_io(const struct md_buf *out, 
 		warn("%s", out->name);
 		c = 1;
 	}
+	if (1 == c && STDOUT_FILENO != out->fd)
+		if (-1 == unlink(out->name))
+			warn("%s", out->name);
 
 	return(c);
 }
@@ -217,5 +233,6 @@ usage(void)
 {
 	extern char	*__progname;
 
-	(void)printf("usage: %s [-vW] [-o outfile] [infile]\n", __progname);
+	(void)printf("usage: %s [-vW] [-f filter] [-o outfile] "
+			"[infile]\n", __progname);
 }