===================================================================
RCS file: /cvs/mandoc/mdoc_validate.c,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -p -r1.2 -r1.4
--- mandoc/mdoc_validate.c	2009/03/31 13:50:19	1.2
+++ mandoc/mdoc_validate.c	2009/04/12 19:19:57	1.4
@@ -1,4 +1,4 @@
-/* $Id: mdoc_validate.c,v 1.2 2009/03/31 13:50:19 kristaps Exp $ */
+/* $Id: mdoc_validate.c,v 1.4 2009/04/12 19:19:57 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *
@@ -51,6 +51,7 @@ enum	merr {
 };
 
 enum	mwarn {
+	WPRINT,
 	WESCAPE,
 	WWRONGMSEC,
 	WSECOOO,
@@ -95,6 +96,7 @@ static	int	warn_child_gt(struct mdoc *, const char *, 
 static	int	err_child_eq(struct mdoc *, const char *, int);
 static	int	warn_child_eq(struct mdoc *, const char *, int);
 static	int	count_child(struct mdoc *);
+static	int	warn_print(struct mdoc *, int, int);
 static	int	warn_count(struct mdoc *, const char *, 
 			int, const char *, int);
 static	int	err_count(struct mdoc *, const char *, 
@@ -311,7 +313,6 @@ const	struct valids mdoc_valids[MDOC_MAX] = {
 
 
 #ifdef __linux__
-extern	size_t	strlcpy(char *, const char *, size_t);
 extern	size_t	strlcat(char *, const char *, size_t);
 #endif
 
@@ -461,6 +462,9 @@ pwarn(struct mdoc *m, int line, int pos, enum mwarn ty
 		p = "prologue macros out-of-order";
 		c = WARN_COMPAT;
 		break;
+	case (WPRINT):
+		p = "invalid character";
+		break;
 	case (WESCAPE):
 		p = "invalid escape sequence";
 		break;
@@ -498,7 +502,15 @@ pwarn(struct mdoc *m, int line, int pos, enum mwarn ty
 }
 
 
+static int
+warn_print(struct mdoc *m, int ln, int pos)
+{
+	if (MDOC_IGN_CHARS & m->pflags)
+		return(pwarn(m, ln, pos, WPRINT));
+	return(perr(m, ln, pos, EPRINT));
+}
 
+
 static inline int
 warn_count(struct mdoc *m, const char *k, 
 		int want, const char *v, int has)
@@ -700,9 +712,11 @@ check_text(struct mdoc *mdoc, int line, int pos, const
 	for ( ; *p; p++) {
 		if ('\t' == *p) {
 			if ( ! (MDOC_LITERAL & mdoc->flags))
-				return(perr(mdoc, line, pos, EPRINT));
+				if ( ! warn_print(mdoc, line, pos))
+					return(0);
 		} else if ( ! isprint((u_char)*p))
-			return(perr(mdoc, line, pos, EPRINT));
+			if ( ! warn_print(mdoc, line, pos))
+				return(0);
 
 		if ('\\' != *p)
 			continue;
@@ -1352,6 +1366,7 @@ post_sh_head(POST_ARGS)
 
 	/* This is just concat() inlined, which is irritating. */
 
+	buf[0] = 0;
 	for (n = mdoc->last->child; n; n = n->next) {
 		assert(MDOC_TEXT == n->type);
 		if (strlcat(buf, n->string, 64) >= 64)