Have -Tlint imply -Wall and -fstrict. Based on a patch submitted by Ingo Schwarze.

2 files changed, 47 insertions, 35 deletions

diff --git a/main.c b/main.c
index 4309818a..795c6493 100644
--- a/main.c
+++ b/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.59 2010/01/29 14:39:38 kristaps Exp $ */
+/*	$Id: main.c,v 1.60 2010/03/22 20:43:00 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -72,11 +72,11 @@ 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	IGN_ERRORS	 (1 << 4)	/* Ignore failed parse. */
+#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_NIGN_CHARS	 (1 << 3)	/* Don't ignore bad chars. */
+#define	FL_IGN_ERRORS	 (1 << 4)	/* Ignore failed parse. */
 	enum intt	  inttype;	/* Input parsers... */
 	struct man	 *man;
 	struct man	 *lastman;
@@ -90,8 +90,12 @@ struct	curparse {
 	char		  outopts[BUFSIZ];
 };
 
+#define	FL_STRICT	  FL_NIGN_ESCAPE | \
+			  FL_NIGN_MACRO | \
+ 			  FL_NIGN_CHARS
+
 static	int		  foptions(int *, char *);
-static	int		  toptions(enum outt *, char *);
+static	int		  toptions(struct curparse *, char *);
 static	int		  moptions(enum intt *, char *);
 static	int		  woptions(int *, char *);
 static	int		  merr(void *, int, int, const char *);
@@ -144,7 +148,7 @@ main(int argc, char *argv[])
 			(void)strlcat(curp.outopts, ",", BUFSIZ);
 			break;
 		case ('T'):
-			if ( ! toptions(&curp.outtype, optarg))
+			if ( ! toptions(&curp, optarg))
 				return(EXIT_FAILURE);
 			break;
 		case ('W'):
@@ -172,7 +176,7 @@ main(int argc, char *argv[])
 		curp.fd = STDIN_FILENO;
 
 		c = fdesc(&blk, &ln, &curp);
-		if ( ! (IGN_ERRORS & curp.fflags)) 
+		if ( ! (FL_IGN_ERRORS & curp.fflags)) 
 			rc = 1 == c ? 1 : 0;
 		else
 			rc = -1 == c ? 0 : 1;
@@ -180,7 +184,7 @@ main(int argc, char *argv[])
 
 	while (rc && *argv) {
 		c = ffile(&blk, &ln, *argv, &curp);
-		if ( ! (IGN_ERRORS & curp.fflags)) 
+		if ( ! (FL_IGN_ERRORS & curp.fflags)) 
 			rc = 1 == c ? 1 : 0;
 		else
 			rc = -1 == c ? 0 : 1;
@@ -244,11 +248,11 @@ man_init(struct curparse *curp)
 
 	pflags = MAN_IGN_MACRO | MAN_IGN_ESCAPE | MAN_IGN_CHARS;
 
-	if (curp->fflags & NO_IGN_MACRO)
+	if (curp->fflags & FL_NIGN_MACRO)
 		pflags &= ~MAN_IGN_MACRO;
-	if (curp->fflags & NO_IGN_CHARS)
+	if (curp->fflags & FL_NIGN_CHARS)
 		pflags &= ~MAN_IGN_CHARS;
-	if (curp->fflags & NO_IGN_ESCAPE)
+	if (curp->fflags & FL_NIGN_ESCAPE)
 		pflags &= ~MAN_IGN_ESCAPE;
 
 	return(man_alloc(curp, pflags, &mancb));
@@ -268,13 +272,13 @@ mdoc_init(struct curparse *curp)
 
 	pflags = MDOC_IGN_MACRO | MDOC_IGN_ESCAPE | MDOC_IGN_CHARS;
 
-	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)
+	if (curp->fflags & FL_NIGN_CHARS)
 		pflags &= ~MDOC_IGN_CHARS;
 
 	return(mdoc_alloc(curp, pflags, &mdoccb));
@@ -546,19 +550,22 @@ 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"))
-		*tflags = OUTT_HTML;
+		curp->outtype = OUTT_HTML;
 	else if (0 == strcmp(arg, "xhtml"))
-		*tflags = OUTT_XHTML;
+		curp->outtype = OUTT_XHTML;
 	else {
 		fprintf(stderr, "%s: Bad argument\n", arg);
 		return(0);
@@ -587,26 +594,25 @@ foptions(int *fflags, char *arg)
 		o = arg;
 		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_NIGN_CHARS;
 			break;
 		case (4):
-			*fflags |= IGN_ERRORS;
+			*fflags |= FL_IGN_ERRORS;
 			break;
 		case (5):
-			*fflags |= NO_IGN_ESCAPE | 
-			 	   NO_IGN_MACRO | NO_IGN_CHARS;
+			*fflags |= FL_STRICT;
 			break;
 		case (6):
-			*fflags &= ~NO_IGN_ESCAPE;
+			*fflags &= ~FL_NIGN_ESCAPE;
 			break;
 		default:
 			fprintf(stderr, "%s: Bad argument\n", o);
diff --git a/mandoc.1 b/mandoc.1
index 5ab24126..dc19d34b 100644
--- a/mandoc.1
+++ b/mandoc.1
@@ -1,4 +1,4 @@
-.\"	$Id: mandoc.1,v 1.51 2010/03/22 14:03:03 kristaps Exp $
+.\"	$Id: mandoc.1,v 1.52 2010/03/22 20:43:00 kristaps Exp $
 .\"
 .\" Copyright (c) 2009 Kristaps Dzonsons <kristaps@kth.se>
 .\"
@@ -176,6 +176,10 @@ Produce an indented parse tree.
 .
 .It Fl T Ns Ar lint
 Parse only: produce no output.
+Implies
+.Fl W Ns Ar all
+and
+.Fl f Ns Ar strict .
 .El
 .
 .Pp
@@ -225,6 +229,8 @@ over a large set of manuals passed on the command line.
 .Ss Output Options
 For the time being, only
 .Fl T Ns Ar html
+and
+.Fl T Ns Ar xhtml
 accepts output options:
 .Bl -tag -width Ds
 .It Fl O Ns Ar style=style.css
@@ -527,7 +533,7 @@ and
 .Xr man 7 .
 .Pp
 Nesting elements within next-line element scopes of
-.Fl m Ar Ns an ,
+.Fl m Ns Ar an ,
 such as
 .Sq br
 within an empty
@@ -536,4 +542,4 @@ will confuse
 .Fl T Ns Ar html
 and
 .Fl T Ns Ar xhtml
-and cause it to forget the formatting.
+and cause them to forget the formatting of the prior next-line scope.