===================================================================
RCS file: /cvs/mandoc/man.c,v
retrieving revision 1.45
retrieving revision 1.49
diff -u -p -r1.45 -r1.49
--- mandoc/man.c	2009/10/30 05:58:37	1.45
+++ mandoc/man.c	2010/01/07 10:24:43	1.49
@@ -1,4 +1,4 @@
-/*	$Id: man.c,v 1.45 2009/10/30 05:58:37 kristaps Exp $ */
+/*	$Id: man.c,v 1.49 2010/01/07 10:24:43 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -14,6 +14,10 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <sys/types.h>
 
 #include <assert.h>
@@ -72,11 +76,7 @@ static	int		 pstring(struct man *, int, int, 
 				const char *, size_t);
 static	int		 macrowarn(struct man *, int, const char *);
 
-#ifdef __linux__
-extern	size_t	  	  strlcpy(char *, const char *, size_t);
-#endif
 
-
 const struct man_node *
 man_node(const struct man *m)
 {
@@ -365,6 +365,7 @@ static int
 man_ptext(struct man *m, int line, char *buf)
 {
 	int		 i, j;
+	char		 sv;
 
 	/* Literal free-form text whitespace is preserved. */
 
@@ -378,7 +379,12 @@ man_ptext(struct man *m, int line, char *buf)
 
 	for (i = 0; ' ' == buf[i]; i++)
 		/* Skip leading whitespace. */ ;
-	if (0 == buf[i]) {
+
+	if ('\0' == buf[i]) {
+		/* Trailing whitespace? */
+		if (i && ' ' == buf[i - 1])
+			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
+				return(0);
 		if ( ! pstring(m, line, 0, &buf[i], 0))
 			return(0);
 		goto descope;
@@ -392,15 +398,30 @@ man_ptext(struct man *m, int line, char *buf)
 		if (i && ' ' == buf[i] && '\\' == buf[i - 1])
 			continue;
 
-		buf[i++] = 0;
+		sv = buf[i];
+		buf[i++] = '\0';
+
 		if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
 			return(0);
 
+		/* Trailing whitespace?  Check at overwritten byte. */
+
+		if (' ' == sv && '\0' == buf[i])
+			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
+				return(0);
+
 		for ( ; ' ' == buf[i]; i++)
 			/* Skip trailing whitespace. */ ;
 
 		j = i;
-		if (0 == buf[i])
+
+		/* Trailing whitespace? */
+
+		if (' ' == buf[i - 1] && '\0' == buf[i])
+			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
+				return(0);
+
+		if ('\0' == buf[i])
 			break;
 	}
 
@@ -454,8 +475,8 @@ man_pmacro(struct man *m, int ln, char *buf)
 
 	fl = m->flags;
 
-	if (0 == buf[1])
-		goto out;
+	if ('\0' == buf[1])
+		return(1);
 
 	i = 1;
 
@@ -463,7 +484,7 @@ man_pmacro(struct man *m, int ln, char *buf)
 		i++;
 		while (buf[i] && ' ' == buf[i])
 			i++;
-		if (0 == buf[i])
+		if ('\0' == buf[i])
 			goto out;
 	}
 
@@ -472,7 +493,7 @@ man_pmacro(struct man *m, int ln, char *buf)
 	/* Copy the first word into a nil-terminated buffer. */
 
 	for (j = 0; j < 4; j++, i++) {
-		if (0 == (mac[j] = buf[i]))
+		if ('\0' == (mac[j] = buf[i]))
 			break;
 		else if (' ' == buf[i])
 			break;
@@ -484,7 +505,7 @@ man_pmacro(struct man *m, int ln, char *buf)
 		return(man_perr(m, ln, i, WNPRINT));
 	}
 
-	mac[j] = 0;
+	mac[j] = '\0';
 
 	if (j == 4 || j < 1) {
 		if ( ! (MAN_IGN_MACRO & m->pflags)) {
@@ -506,6 +527,12 @@ man_pmacro(struct man *m, int ln, char *buf)
 
 	while (buf[i] && ' ' == buf[i])
 		i++;
+
+	/* Trailing whitespace? */
+
+	if ('\0' == buf[i] && ' ' == buf[i - 1])
+		if ( ! man_pwarn(m, ln, i - 1, WTSPACE))
+			goto err;
 
 	/* Remove prior ELINE macro, if applicable. */