===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/mandoc/man.c	2009/12/23 22:30:17	1.17
--- src/usr.bin/mandoc/man.c	2010/02/18 02:11:26	1.18
***************
*** 1,4 ****
! /*	$Id: man.c,v 1.17 2009/12/23 22:30:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: man.c,v 1.18 2010/02/18 02:11:26 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 361,366 ****
--- 361,367 ----
  man_ptext(struct man *m, int line, char *buf)
  {
  	int		 i, j;
+ 	char		 sv;
  
  	/* Literal free-form text whitespace is preserved. */
  
***************
*** 374,380 ****
  
  	for (i = 0; ' ' == buf[i]; i++)
  		/* Skip leading whitespace. */ ;
! 	if (0 == buf[i]) {
  		if ( ! pstring(m, line, 0, &buf[i], 0))
  			return(0);
  		goto descope;
--- 375,386 ----
  
  	for (i = 0; ' ' == buf[i]; i++)
  		/* Skip leading whitespace. */ ;
! 
! 	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;
***************
*** 388,402 ****
  		if (i && ' ' == buf[i] && '\\' == buf[i - 1])
  			continue;
  
! 		buf[i++] = 0;
  		if ( ! pstring(m, line, j, &buf[j], (size_t)(i - j)))
  			return(0);
  
  		for ( ; ' ' == buf[i]; i++)
  			/* Skip trailing whitespace. */ ;
  
  		j = i;
! 		if (0 == buf[i])
  			break;
  	}
  
--- 394,423 ----
  		if (i && ' ' == buf[i] && '\\' == buf[i - 1])
  			continue;
  
! 		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;
! 
! 		/* Trailing whitespace? */
! 
! 		if (' ' == buf[i - 1] && '\0' == buf[i])
! 			if ( ! man_pwarn(m, line, i - 1, WTSPACE))
! 				return(0);
! 
! 		if ('\0' == buf[i])
  			break;
  	}
  
***************
*** 459,465 ****
  		i++;
  		while (buf[i] && ' ' == buf[i])
  			i++;
! 		if (0 == buf[i])
  			goto out;
  	}
  
--- 480,486 ----
  		i++;
  		while (buf[i] && ' ' == buf[i])
  			i++;
! 		if ('\0' == buf[i])
  			goto out;
  	}
  
***************
*** 468,474 ****
  	/* Copy the first word into a nil-terminated buffer. */
  
  	for (j = 0; j < 4; j++, i++) {
! 		if (0 == (mac[j] = buf[i]))
  			break;
  		else if (' ' == buf[i])
  			break;
--- 489,495 ----
  	/* Copy the first word into a nil-terminated buffer. */
  
  	for (j = 0; j < 4; j++, i++) {
! 		if ('\0' == (mac[j] = buf[i]))
  			break;
  		else if (' ' == buf[i])
  			break;
***************
*** 502,507 ****
--- 523,534 ----
  
  	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. */