Downgrade .Bd -file from FATAL to ERROR.

Since this was the last remaining FATAL error in this area,
this change will allow major simplifications in the mdoc(7) parser.

6 files changed, 33 insertions, 6 deletions

diff --git a/regress/usr.bin/mandoc/mdoc/Bd/badargs.in b/regress/usr.bin/mandoc/mdoc/Bd/badargs.in
index 95d5b3cef5e..0dbd2931160 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/badargs.in
+++ b/regress/usr.bin/mandoc/mdoc/Bd/badargs.in
@@ -29,3 +29,18 @@ unfilled
 unfilled
 ragged
 .Ed
+file /dev/null:
+.Bd -ragged -file /dev/null -offset indent
+ragged
+offset indent
+.Ed
+trailing -file:
+.Bd -ragged -offset indent -file
+ragged
+offset indent
+.Ed
+missing -file argument:
+.Bd -ragged -offset indent -file -compact
+ragged
+offset indent
+.Ed
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_ascii b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_ascii
index b690d28e570..8cfd38e5f58 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_ascii
+++ b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_ascii
@@ -16,5 +16,14 @@ DDEESSCCRRIIPPTTIIOONN
      ragged unfilled
      unfilled
      ragged
+     file /dev/null:
+
+           ragged offset indent
+     trailing -file:
+
+           ragged offset indent
+     missing -file argument:
+
+           ragged offset indent
 
 OpenBSD                          July 5, 2014                          OpenBSD
diff --git a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint
index 2d45ea2a173..38bd1135d8e 100644
--- a/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bd/badargs.out_lint
@@ -5,3 +5,6 @@ mandoc: badargs.in:14:51: WARNING: duplicate argument: Bd -offset 6n
 mandoc: badargs.in:19:2: WARNING: missing display type, using -ragged: Bd
 mandoc: badargs.in:24:2: WARNING: skipping duplicate display type: Bd -unfilled
 mandoc: badargs.in:28:2: WARNING: skipping duplicate display type: Bd -ragged
+mandoc: badargs.in:33:2: ERROR: NOT IMPLEMENTED: Bd -file
+mandoc: badargs.in:38:2: ERROR: NOT IMPLEMENTED: Bd -file
+mandoc: badargs.in:43:2: ERROR: NOT IMPLEMENTED: Bd -file
diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h
index 483a36392e1..4c6a604cd3a 100644
--- a/usr.bin/mandoc/mandoc.h
+++ b/usr.bin/mandoc/mandoc.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mandoc.h,v 1.113 2014/11/27 14:31:29 deraadt Exp $ */
+/*	$OpenBSD: mandoc.h,v 1.114 2014/11/27 23:35:03 schwarze Exp $ */
 /*
  * Copyright (c) 2010, 2011, 2014 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -157,6 +157,7 @@ enum	mandocerr {
 	/* related to request and macro arguments */
 	MANDOCERR_NAMESC, /* escaped character not allowed in a name: name */
 	MANDOCERR_ARGCOUNT, /* argument count wrong */
+	MANDOCERR_BD_FILE, /* NOT IMPLEMENTED: Bd -file */
 	MANDOCERR_BL_NOTYPE, /* missing list type, using -item: Bl */
 	MANDOCERR_NM_NONAME, /* missing manual name, using "": Nm */
 	MANDOCERR_OS_UNAME, /* uname(3) system call failed, using UNKNOWN */
@@ -169,7 +170,6 @@ enum	mandocerr {
 	MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
 
 	MANDOCERR_TOOLARGE, /* input too large */
-	MANDOCERR_BD_FILE, /* NOT IMPLEMENTED: Bd -file */
 	MANDOCERR_SO_PATH, /* NOT IMPLEMENTED: .so with absolute path or ".." */
 	MANDOCERR_SO_FAIL, /* .so request failed */
 
diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c
index 80dee7ea282..26b1aeb813d 100644
--- a/usr.bin/mandoc/mdoc_validate.c
+++ b/usr.bin/mandoc/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mdoc_validate.c,v 1.173 2014/11/27 16:20:27 schwarze Exp $ */
+/*	$OpenBSD: mdoc_validate.c,v 1.174 2014/11/27 23:35:03 schwarze Exp $ */
 /*
  * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -759,7 +759,7 @@ pre_bd(PRE_ARGS)
 		case MDOC_File:
 			mandoc_msg(MANDOCERR_BD_FILE, mdoc->parse,
 			    n->line, n->pos, NULL);
-			return(0);
+			break;
 		case MDOC_Offset:
 			if (0 == argv->sz) {
 				mandoc_msg(MANDOCERR_ARG_EMPTY,
diff --git a/usr.bin/mandoc/read.c b/usr.bin/mandoc/read.c
index 2fa50e5af62..5da1fa97f31 100644
--- a/usr.bin/mandoc/read.c
+++ b/usr.bin/mandoc/read.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: read.c,v 1.74 2014/11/26 23:27:13 schwarze Exp $ */
+/*	$OpenBSD: read.c,v 1.75 2014/11/27 23:35:03 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
@@ -196,6 +196,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = {
 	/* related to request and macro arguments */
 	"escaped character not allowed in a name",
 	"argument count wrong",
+	"NOT IMPLEMENTED: Bd -file",
 	"missing list type, using -item",
 	"missing manual name, using \"\"",
 	"uname(3) system call failed, using UNKNOWN",
@@ -208,7 +209,6 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = {
 	"generic fatal error",
 
 	"input too large",
-	"NOT IMPLEMENTED: Bd -file",
 	"NOT IMPLEMENTED: .so with absolute path or \"..\"",
 	".so request failed",