Do not throw FATAL errors when there is no need to:

 - when encountering nested displays (.Bd containing .Bd, .D1, .D1)
 - when a block end macro was forgotten
 - when ending a block that was never started
 - when the uname(3) system call failed
along with a little related cleanup

5 files changed, 42 insertions, 47 deletions

diff --git a/usr.bin/mandoc/main.c b/usr.bin/mandoc/main.c
index 1c620192b62..55cccbd03bf 100644
--- a/usr.bin/mandoc/main.c
+++ b/usr.bin/mandoc/main.c
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.49 2010/10/16 20:49:37 schwarze Exp $ */
+/*	$Id: main.c,v 1.50 2010/10/24 18:15:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -121,6 +121,7 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = {
 	"bad date argument",
 	"bad width argument",
 	"unknown manual section",
+	"nested displays are not portable",
 	"section not in conventional manual section",
 	"end of line whitespace",
 	"blocks badly nested",
@@ -148,8 +149,10 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = {
 	"line scope broken",
 	"argument count wrong",
 	"request scope close w/none open",
+	"missing end of block",
 	"scope already open",
 	"scope open on exit",
+	"uname(3) system call failed",
 	"macro requires line argument(s)",
 	"macro requires body argument(s)",
 	"macro requires argument(s)",
@@ -165,17 +168,13 @@ static	const char * const	mandocerrs[MANDOCERR_MAX] = {
 	"generic fatal error",
 
 	"column syntax is inconsistent",
-	"displays may not be nested",
 	"unsupported display type",
-	"blocks badly nested",
-	"no such block is open",
 	"line scope broken, syntax violated",
 	"argument count wrong, violates syntax",
 	"child violates parent syntax",
 	"argument count wrong, violates syntax",
 	"no document body",
 	"no document prologue",
-	"utsname system call failed",
 	"static buffer exhausted",
 };
 
diff --git a/usr.bin/mandoc/mandoc.h b/usr.bin/mandoc/mandoc.h
index 996cd1e03c9..fbd8f057494 100644
--- a/usr.bin/mandoc/mandoc.h
+++ b/usr.bin/mandoc/mandoc.h
@@ -1,4 +1,4 @@
-/*	$Id: mandoc.h,v 1.16 2010/10/23 15:49:30 schwarze Exp $ */
+/*	$Id: mandoc.h,v 1.17 2010/10/24 18:15:43 schwarze Exp $ */
 /*
  * Copyright (c) 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -63,6 +63,7 @@ enum	mandocerr {
 	MANDOCERR_BADDATE, /* bad date argument */
 	MANDOCERR_BADWIDTH, /* bad width argument */
 	MANDOCERR_BADMSEC, /* unknown manual section */
+	MANDOCERR_NESTEDDISP, /* nested displays are not portable */
 	MANDOCERR_SECMSEC, /* section not in conventional manual section */
 	MANDOCERR_EOLNSPACE, /* end of line whitespace */
 	MANDOCERR_SCOPENEST, /* blocks badly nested */
@@ -89,8 +90,10 @@ enum	mandocerr {
 	MANDOCERR_LINESCOPE, /* line scope broken */
 	MANDOCERR_ARGCOUNT, /* argument count wrong */
 	MANDOCERR_NOSCOPE, /* no such block is open */
+	MANDOCERR_SCOPEBROKEN, /* missing end of block */
 	MANDOCERR_SCOPEREP, /* scope already open */
 	MANDOCERR_SCOPEEXIT, /* scope open on exit */
+	MANDOCERR_UNAME, /* uname(3) system call failed */
 	/* FIXME: merge following with MANDOCERR_ARGCOUNT */
 	MANDOCERR_NOARGS, /* macro requires line argument(s) */
 	MANDOCERR_NOBODY, /* macro requires body argument(s) */
@@ -106,18 +109,13 @@ enum	mandocerr {
 
 	MANDOCERR_FATAL, /* ===== start of fatal errors ===== */
 	MANDOCERR_COLUMNS, /* column syntax is inconsistent */
-	/* FIXME: this should be a MANDOCERR_ERROR */
-	MANDOCERR_NESTEDDISP, /* displays may not be nested */
 	MANDOCERR_BADDISP, /* unsupported display type */
-	MANDOCERR_SCOPEFATAL, /* blocks badly nested */
-	MANDOCERR_SYNTNOSCOPE, /* no scope to rewind: syntax violated */
 	MANDOCERR_SYNTLINESCOPE, /* line scope broken, syntax violated */
 	MANDOCERR_SYNTARGVCOUNT, /* argument count wrong, violates syntax */
 	MANDOCERR_SYNTCHILD, /* child violates parent syntax */
 	MANDOCERR_SYNTARGCOUNT, /* argument count wrong, violates syntax */
 	MANDOCERR_NODOCBODY, /* no document body */
 	MANDOCERR_NODOCPROLOG, /* no document prologue */
-	MANDOCERR_UTSNAME, /* utsname system call failed */
 	MANDOCERR_MEM, /* static buffer exhausted */
 	MANDOCERR_MAX
 };
diff --git a/usr.bin/mandoc/mdoc_action.c b/usr.bin/mandoc/mdoc_action.c
index b225823ab9b..043ef48857d 100644
--- a/usr.bin/mandoc/mdoc_action.c
+++ b/usr.bin/mandoc/mdoc_action.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_action.c,v 1.45 2010/10/16 13:38:29 schwarze Exp $ */
+/*	$Id: mdoc_action.c,v 1.46 2010/10/24 18:15:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -600,8 +600,7 @@ post_os(POST_ARGS)
 	struct utsname	  utsname;
 #endif
 
-	if (m->meta.os)
-		free(m->meta.os);
+	free(m->meta.os);
 
 	if ( ! concat(m, buf, n->child, BUFSIZ))
 		return(0);
@@ -617,14 +616,17 @@ post_os(POST_ARGS)
 			return(0);
 		}
 #else /*!OSNAME */
-		if (-1 == uname(&utsname))
-			return(mdoc_nmsg(m, n, MANDOCERR_UTSNAME));
+		if (uname(&utsname)) {
+			mdoc_nmsg(m, n, MANDOCERR_UNAME);
+			m->meta.os = mandoc_strdup("UNKNOWN");
+			return(post_prol(m, n));
+		}
 
 		if (strlcat(buf, utsname.sysname, BUFSIZ) >= BUFSIZ) {
 			mdoc_nmsg(m, n, MANDOCERR_MEM);
 			return(0);
 		}
-		if (strlcat(buf, " ", 64) >= BUFSIZ) {
+		if (strlcat(buf, " ", BUFSIZ) >= BUFSIZ) {
 			mdoc_nmsg(m, n, MANDOCERR_MEM);
 			return(0);
 		}
diff --git a/usr.bin/mandoc/mdoc_macro.c b/usr.bin/mandoc/mdoc_macro.c
index 4a495a66734..22af70bdab6 100644
--- a/usr.bin/mandoc/mdoc_macro.c
+++ b/usr.bin/mandoc/mdoc_macro.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_macro.c,v 1.58 2010/10/16 13:38:29 schwarze Exp $ */
+/*	$Id: mdoc_macro.c,v 1.59 2010/10/24 18:15:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2010 Ingo Schwarze <schwarze@openbsd.org>
@@ -30,6 +30,7 @@ enum	rew {	/* see rew_dohalt() */
 	REWIND_NONE,
 	REWIND_THIS,
 	REWIND_MORE,
+	REWIND_FORCE,
 	REWIND_LATER,
 	REWIND_ERROR
 };
@@ -324,6 +325,7 @@ rew_alt(enum mdoct tok)
  *   inside *p, so there is no need to rewind anything at all.
  * REWIND_THIS: *p matches tok, so rewind *p and nothing else.
  * REWIND_MORE: *p is implicit, rewind it and keep searching for tok.
+ * REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p.
  * REWIND_LATER: *p is explicit and still open, postpone rewinding.
  * REWIND_ERROR: No tok block is open at all.
  */
@@ -417,16 +419,13 @@ rew_dohalt(enum mdoct tok, enum mdoc_type type,
 		return(REWIND_MORE);
 
 	/*
-	 * Partial blocks allow delayed rewinding by default.
+	 * By default, closing out full blocks
+	 * forces closing of broken explicit blocks,
+	 * while closing out partial blocks
+	 * allows delayed rewinding by default.
 	 */
-	if (&blk_full != mdoc_macros[tok].fp)
-		return (REWIND_LATER);
-
-	/*
-	 * Full blocks can only be rewound when matching
-	 * or when there is an explicit rule.
-	 */
-	return(REWIND_ERROR);
+	return (&blk_full == mdoc_macros[tok].fp ?
+	    REWIND_FORCE : REWIND_LATER);
 }
 
 
@@ -517,9 +516,7 @@ make_pending(struct mdoc_node *broken, enum mdoct tok,
 	/*
 	 * Found no matching block for tok.
 	 * Are you trying to close a block that is not open?
-	 * XXX Make this non-fatal.
 	 */
-	mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE);
 	return(0);
 }
 
@@ -537,17 +534,22 @@ rew_sub(enum mdoc_type t, struct mdoc *m,
 			return(1);
 		case (REWIND_THIS):
 			break;
+		case (REWIND_FORCE):
+			mdoc_vmsg(m, MANDOCERR_SCOPEBROKEN, line, ppos,
+			    "%s breaks %s", mdoc_macronames[tok],
+			    mdoc_macronames[n->tok]);
+			/* FALLTHROUGH */
 		case (REWIND_MORE):
 			n = n->parent;
 			continue;
 		case (REWIND_LATER):
-			return(make_pending(n, tok, m, line, ppos));
+			if (make_pending(n, tok, m, line, ppos) ||
+			    MDOC_BLOCK != t)
+				return(1);
+			/* FALLTHROUGH */
 		case (REWIND_ERROR):
-			/* XXX Make this non-fatal. */
-			mdoc_vmsg(m, MANDOCERR_SCOPEFATAL, line, ppos,
-			    "%s cannot break %s", mdoc_macronames[tok],
-			    mdoc_macronames[n->tok]);
-			return 0;
+			mdoc_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);
+			return(1);
 		}
 		break;
 	}
@@ -675,8 +677,7 @@ blk_exp_close(MACRO_PROT_ARGS)
 			 * postpone closing out the current block
 			 * until the rew_sub() closing out the sub-block.
 			 */
-			if ( ! make_pending(later, tok, m, line, ppos))
-				return(0);
+			make_pending(later, tok, m, line, ppos);
 
 			/*
 			 * Mark the place where the formatting - but not
@@ -1282,8 +1283,7 @@ blk_part_imp(MACRO_PROT_ARGS)
 		    MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
 		    ! (MDOC_VALID & n->flags)) {
 			assert( ! (MDOC_ACTED & n->flags));
-			if ( ! make_pending(n, tok, m, line, ppos))
-				return(0);
+			make_pending(n, tok, m, line, ppos);
 			if ( ! mdoc_endbody_alloc(m, line, ppos,
 			    tok, body, ENDBODY_NOSPACE))
 				return(0);
diff --git a/usr.bin/mandoc/mdoc_validate.c b/usr.bin/mandoc/mdoc_validate.c
index 2e1895daabb..f2b89dc365d 100644
--- a/usr.bin/mandoc/mdoc_validate.c
+++ b/usr.bin/mandoc/mdoc_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: mdoc_validate.c,v 1.73 2010/10/23 17:04:51 schwarze Exp $ */
+/*	$Id: mdoc_validate.c,v 1.74 2010/10/24 18:15:43 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -549,21 +549,17 @@ pre_display(PRE_ARGS)
 {
 	struct mdoc_node *node;
 
-	/* Display elements (`Bd', `D1'...) cannot be nested. */
-
 	if (MDOC_BLOCK != n->type)
 		return(1);
 
-	/* LINTED */
 	for (node = mdoc->last->parent; node; node = node->parent) 
 		if (MDOC_BLOCK == node->type)
 			if (MDOC_Bd == node->tok)
 				break;
-	if (NULL == node)
-		return(1);
+	if (node)
+		mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP);
 
-	mdoc_nmsg(mdoc, n, MANDOCERR_NESTEDDISP);
-	return(0);
+	return(1);
 }