===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -c -r1.33 -r1.34
*** src/usr.bin/mandoc/mdoc.c	2010/01/02 02:42:06	1.33
--- src/usr.bin/mandoc/mdoc.c	2010/02/18 02:11:26	1.34
***************
*** 1,4 ****
! /*	$Id: mdoc.c,v 1.33 2010/01/02 02:42:06 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
--- 1,4 ----
! /*	$Id: mdoc.c,v 1.34 2010/02/18 02:11:26 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
   *
***************
*** 577,582 ****
--- 577,583 ----
  parsetext(struct mdoc *m, int line, char *buf)
  {
  	int		 i, j;
+ 	char		 sv;
  
  	if (SEC_NONE == m->lastnamed)
  		return(mdoc_perr(m, line, 0, ETEXTPROL));
***************
*** 593,599 ****
  
  	for (i = 0; ' ' == buf[i]; i++)
  		/* Skip leading whitespace. */ ;
! 	if (0 == buf[i])
  		return(mdoc_perr(m, line, 0, ENOBLANK));
  
  	/*
--- 594,601 ----
  
  	for (i = 0; ' ' == buf[i]; i++)
  		/* Skip leading whitespace. */ ;
! 
! 	if ('\0' == buf[i])
  		return(mdoc_perr(m, line, 0, ENOBLANK));
  
  	/*
***************
*** 609,623 ****
  		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;
  	}
  
--- 611,640 ----
  		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 ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
+ 				return(0);
+ 
  		for ( ; ' ' == buf[i]; i++)
  			/* Skip trailing whitespace. */ ;
  
  		j = i;
! 
! 		/* Trailing whitespace? */
! 
! 		if (' ' == buf[i - 1] && '\0' == buf[i])
! 			if ( ! mdoc_pwarn(m, line, i - 1, ETAILWS))
! 				return(0);
! 
! 		if ('\0' == buf[i])
  			break;
  	}
  
***************
*** 654,660 ****
  
  	/* Empty lines are ignored. */
  
! 	if (0 == buf[1])
  		return(1);
  
  	i = 1;
--- 671,677 ----
  
  	/* Empty lines are ignored. */
  
! 	if ('\0' == buf[1])
  		return(1);
  
  	i = 1;
***************
*** 665,678 ****
  		i++;
  		while (buf[i] && ' ' == buf[i])
  			i++;
! 		if (0 == buf[i])
  			return(1);
  	}
  
  	/* 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;
--- 682,695 ----
  		i++;
  		while (buf[i] && ' ' == buf[i])
  			i++;
! 		if ('\0' == buf[i])
  			return(1);
  	}
  
  	/* 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;
***************
*** 702,707 ****
--- 719,730 ----
  
  	while (buf[i] && ' ' == buf[i])
  		i++;
+ 
+ 	/* Trailing whitespace? */
+ 
+ 	if ('\0' == buf[i] && ' ' == buf[i - 1])
+ 		if ( ! mdoc_pwarn(m, ln, i - 1, ETAILWS))
+ 			goto err;
  
  	/* 
  	 * Begin recursive parse sequence.  Since we're at the start of