From 2af8a2f06912ddb01e903aed1843aa570e62620c Mon Sep 17 00:00:00 2001
From: Ingo Schwarze <schwarze@openbsd.org>
Date: Mon, 17 Jan 2011 00:21:29 +0000
Subject: Refrain from throwing fatal errors for * .br .sp .nf .fi .na with
 arguments - just skip the arguments * .TH lacking arguments - use empty
 strings instead like groff * .TH with excessive arguments - skip those
 Reminded by joerg@, ok kristaps@.

---
 man_validate.c | 58 ++++++++++++++++++++++++----------------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

(limited to 'man_validate.c')

diff --git a/man_validate.c b/man_validate.c
index 0762c15a..0dc275a1 100644
--- a/man_validate.c
+++ b/man_validate.c
@@ -1,4 +1,4 @@
-/*	$Id: man_validate.c,v 1.59 2011/01/12 16:55:22 kristaps Exp $ */
+/*	$Id: man_validate.c,v 1.60 2011/01/17 00:21:29 schwarze Exp $ */
 /*
  * Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
  *
@@ -53,7 +53,6 @@ static	int	  check_part(CHKARGS);
 static	int	  check_root(CHKARGS);
 static	int	  check_sec(CHKARGS);
 static	int	  check_text(CHKARGS);
-static	int	  check_title(CHKARGS);
 
 static	int	  post_AT(CHKARGS);
 static	int	  post_fi(CHKARGS);
@@ -70,7 +69,7 @@ static	v_check	  posts_nf[] = { check_eq0, post_nf, NULL };
 static	v_check	  posts_par[] = { check_par, NULL };
 static	v_check	  posts_part[] = { check_part, NULL };
 static	v_check	  posts_sec[] = { check_sec, NULL };
-static	v_check	  posts_th[] = { check_ge2, check_le5, check_title, post_TH, NULL };
+static	v_check	  posts_th[] = { check_ge2, check_le5, post_TH, NULL };
 static	v_check	  posts_uc[] = { post_UC, NULL };
 static	v_check	  pres_bline[] = { check_bline, NULL };
 
@@ -199,29 +198,6 @@ check_root(CHKARGS)
 }
 
 
-static int
-check_title(CHKARGS) 
-{
-	const char	*p;
-
-	assert(n->child);
-	/* FIXME: is this sufficient? */
-	if ('\0' == *n->child->string) {
-		man_nmsg(m, n, MANDOCERR_SYNTARGCOUNT);
-		return(0);
-	}
-
-	for (p = n->child->string; '\0' != *p; p++)
-		/* Only warn about this once... */
-		if (isalpha((u_char)*p) && ! isupper((u_char)*p)) {
-			man_nmsg(m, n, MANDOCERR_UPPERCASE);
-			break;
-		}
-
-	return(1);
-}
-
-
 static int
 check_text(CHKARGS) 
 {
@@ -266,10 +242,10 @@ check_##name(CHKARGS) \
 { \
 	if (n->nchild ineq (x)) \
 		return(1); \
-	man_vmsg(m, MANDOCERR_SYNTARGCOUNT, n->line, n->pos, \
+	man_vmsg(m, MANDOCERR_ARGCOUNT, n->line, n->pos, \
 			"line arguments %s %d (have %d)", \
 			#ineq, (x), n->nchild); \
-	return(0); \
+	return(1); \
 }
 
 INEQ_DEFINE(0, ==, eq0)
@@ -396,6 +372,7 @@ check_bline(CHKARGS)
 static int
 post_TH(CHKARGS)
 {
+	const char	*p;
 
 	if (m->meta.title)
 		free(m->meta.title);
@@ -415,14 +392,26 @@ post_TH(CHKARGS)
 	/* ->TITLE<- MSEC DATE SOURCE VOL */
 
 	n = n->child;
-	assert(n);
-	m->meta.title = mandoc_strdup(n->string);
+	if (n && n->string) {
+		for (p = n->string; '\0' != *p; p++) {
+			/* Only warn about this once... */
+			if (isalpha((u_char)*p) && ! isupper((u_char)*p)) {
+				man_nmsg(m, n, MANDOCERR_UPPERCASE);
+				break;
+			}
+		}
+		m->meta.title = mandoc_strdup(n->string);
+	} else
+		m->meta.title = mandoc_strdup("");
 
 	/* TITLE ->MSEC<- DATE SOURCE VOL */
 
-	n = n->next;
-	assert(n);
-	m->meta.msec = mandoc_strdup(n->string);
+	if (n)
+		n = n->next;
+	if (n && n->string)
+		m->meta.msec = mandoc_strdup(n->string);
+	else
+		m->meta.msec = mandoc_strdup("");
 
 	/* TITLE MSEC ->DATE<- SOURCE VOL */
 
@@ -433,7 +422,8 @@ post_TH(CHKARGS)
 	 * string, then use the current date.
 	 */
 
-	n = n->next;
+	if (n)
+		n = n->next;
 	if (n && n->string && *n->string) {
 		m->meta.date = mandoc_a2time
 			(MTIME_ISO_8601, n->string);
-- 
cgit v1.2.3-56-ge451