better error reporting for .br .fi .nf with arguments

6 files changed, 19 insertions, 16 deletions

diff --git a/regress/usr.bin/mandoc/man/nf/Makefile b/regress/usr.bin/mandoc/man/nf/Makefile
index d3989b320c7..3f984661dc1 100644
--- a/regress/usr.bin/mandoc/man/nf/Makefile
+++ b/regress/usr.bin/mandoc/man/nf/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.6 2014/07/02 11:42:56 schwarze Exp $
+# $OpenBSD: Makefile,v 1.7 2015/02/06 08:28:04 schwarze Exp $
 
 REGRESS_TARGETS = indent args vert dupe userdef
-LINT_TARGETS	= dupe
+LINT_TARGETS	= args dupe
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/man/nf/args.out_lint b/regress/usr.bin/mandoc/man/nf/args.out_lint
new file mode 100644
index 00000000000..dc11881aeb6
--- /dev/null
+++ b/regress/usr.bin/mandoc/man/nf/args.out_lint
@@ -0,0 +1,2 @@
+mandoc: args.in:7:5: ERROR: skipping all arguments: nf arg1 arg2 arg3
+mandoc: args.in:10:5: ERROR: skipping all arguments: fi arg1 arg2 arg3
diff --git a/regress/usr.bin/mandoc/roff/br/Makefile b/regress/usr.bin/mandoc/roff/br/Makefile
index 1d2da255602..4d383beed0d 100644
--- a/regress/usr.bin/mandoc/roff/br/Makefile
+++ b/regress/usr.bin/mandoc/roff/br/Makefile
@@ -1,5 +1,6 @@
-# $OpenBSD: Makefile,v 1.2 2011/11/17 16:28:46 schwarze Exp $
+# $OpenBSD: Makefile,v 1.3 2015/02/06 08:28:04 schwarze Exp $
 
-REGRESS_TARGETS=args
+REGRESS_TARGETS	 = args
+LINT_TARGETS	 = args
 
 .include <bsd.regress.mk>
diff --git a/regress/usr.bin/mandoc/roff/br/args.out_lint b/regress/usr.bin/mandoc/roff/br/args.out_lint
new file mode 100644
index 00000000000..e9a03ad5922
--- /dev/null
+++ b/regress/usr.bin/mandoc/roff/br/args.out_lint
@@ -0,0 +1 @@
+mandoc: args.in:7:5: ERROR: skipping all arguments: br arg1 arg2 arg3
diff --git a/usr.bin/mandoc/man_macro.c b/usr.bin/mandoc/man_macro.c
index 56cd937d050..413f56f63fe 100644
--- a/usr.bin/mandoc/man_macro.c
+++ b/usr.bin/mandoc/man_macro.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: man_macro.c,v 1.57 2015/01/24 10:07:58 schwarze Exp $ */
+/*	$OpenBSD: man_macro.c,v 1.58 2015/02/06 08:28:03 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2012, 2013, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
@@ -418,6 +418,13 @@ in_line_eoln(MACRO_PROT_ARGS)
 	n = man->last;
 
 	for (;;) {
+		if (buf[*pos] != '\0' && (tok == MAN_br ||
+		    tok == MAN_fi || tok == MAN_nf)) {
+			mandoc_vmsg(MANDOCERR_ARG_SKIP,
+			    man->parse, line, *pos, "%s %s",
+			    man_macronames[tok], buf + *pos);
+			break;
+		}
 		la = *pos;
 		if ( ! man_args(man, line, pos, buf, &p))
 			break;
diff --git a/usr.bin/mandoc/man_validate.c b/usr.bin/mandoc/man_validate.c
index d16bdf2be69..965030d7c41 100644
--- a/usr.bin/mandoc/man_validate.c
+++ b/usr.bin/mandoc/man_validate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: man_validate.c,v 1.81 2015/02/06 07:12:34 schwarze Exp $ */
+/*	$OpenBSD: man_validate.c,v 1.82 2015/02/06 08:28:03 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -36,7 +36,6 @@
 
 typedef	void	(*v_check)(CHKARGS);
 
-static	void	  check_eq0(CHKARGS);
 static	void	  check_eq2(CHKARGS);
 static	void	  check_le1(CHKARGS);
 static	void	  check_le5(CHKARGS);
@@ -180,7 +179,6 @@ check_##name(CHKARGS) \
 	    #ineq, (x), n->nchild); \
 }
 
-INEQ_DEFINE(0, ==, eq0)
 INEQ_DEFINE(2, ==, eq2)
 INEQ_DEFINE(1, <=, le1)
 INEQ_DEFINE(5, <=, le5)
@@ -399,9 +397,7 @@ static void
 post_nf(CHKARGS)
 {
 
-	check_eq0(man, n);
-
-	if (MAN_LITERAL & man->flags)
+	if (man->flags & MAN_LITERAL)
 		mandoc_msg(MANDOCERR_NF_SKIP, man->parse,
 		    n->line, n->pos, "nf");
 
@@ -412,8 +408,6 @@ static void
 post_fi(CHKARGS)
 {
 
-	check_eq0(man, n);
-
 	if ( ! (MAN_LITERAL & man->flags))
 		mandoc_msg(MANDOCERR_FI_SKIP, man->parse,
 		    n->line, n->pos, "fi");
@@ -499,9 +493,7 @@ static void
 post_vs(CHKARGS)
 {
 
-	if (n->tok == MAN_br)
-		check_eq0(man, n);
-	else
+	if (n->tok == MAN_sp)
 		check_le1(man, n);
 
 	if (NULL != n->prev)