===================================================================
RCS file: /cvs/docbook2mdoc/main.c,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -p -r1.5 -r1.7
--- docbook2mdoc/main.c	2019/04/09 15:23:51	1.5
+++ docbook2mdoc/main.c	2019/04/28 15:03:29	1.7
@@ -1,4 +1,4 @@
-/* $Id: main.c,v 1.5 2019/04/09 15:23:51 schwarze Exp $ */
+/* $Id: main.c,v 1.7 2019/04/28 15:03:29 schwarze Exp $ */
 /*
  * Copyright (c) 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2019 Ingo Schwarze <schwarze@openbsd.org>
@@ -28,6 +28,12 @@
  * The steering function of the docbook2mdoc(1) program.
  */
 
+enum	outt {
+	OUTT_MDOC = 0,
+	OUTT_TREE,
+	OUTT_LINT
+};
+
 int
 main(int argc, char *argv[])
 {
@@ -36,6 +42,7 @@ main(int argc, char *argv[])
 	const char	*progname;
 	const char	*fname;
 	int		 ch, fd, rc, warn;
+	enum outt	 outtype;
 
 	if ((progname = strrchr(argv[0], '/')) == NULL)
 		progname = argv[0];
@@ -43,8 +50,22 @@ main(int argc, char *argv[])
 		progname++;
 
 	warn = 0;
-	while ((ch = getopt(argc, argv, "W")) != -1) {
+	outtype = OUTT_MDOC;
+	while ((ch = getopt(argc, argv, "T:W")) != -1) {
 		switch (ch) {
+		case 'T':
+			if (strcmp(optarg, "mdoc") == 0)
+				outtype = OUTT_MDOC;
+			else if (strcmp(optarg, "tree") == 0)
+				outtype = OUTT_TREE;
+			else if (strcmp(optarg, "lint") == 0)
+				outtype = OUTT_LINT;
+			else {
+				fprintf(stderr, "%s: Bad argument\n",
+				    optarg);
+				goto usage;
+			}
+			break;
 		case 'W':
 			warn = 1;
 			break;
@@ -73,19 +94,19 @@ main(int argc, char *argv[])
 
 	/* Parse. */
 
-	if ((parser = parse_alloc(warn)) == NULL) {
-		perror(NULL);
-		return 6;
-	}
+	parser = parse_alloc(warn);
 	tree = parse_file(parser, fd, fname);
 	rc = tree->flags & TREE_ERROR ? 3 : tree->flags & TREE_WARN ? 2 : 0;
 
 	/* Format. */
 
-	if (tree->root != NULL) {
+	if (outtype != OUTT_LINT && tree->root != NULL) {
 		if (rc > 2)
 			fputc('\n', stderr);
-		ptree_print(tree);
+		if (outtype == OUTT_MDOC)
+			ptree_print_mdoc(tree);
+		else
+			ptree_print_tree(tree);
 		if (rc > 2)
 			fputs("\nThe output may be incomplete, see the "
 			    "parse error reported above.\n\n", stderr);
@@ -94,6 +115,7 @@ main(int argc, char *argv[])
 	return rc;
 
 usage:
-	fprintf(stderr, "usage: %s [-W] [input_filename]\n", progname);
+	fprintf(stderr, "usage: %s [-W] [-T mdoc | tree | lint] "
+	    "[input_filename]\n", progname);
 	return 5;
 }