===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -c -r1.85 -r1.86
*** src/usr.bin/mandoc/roff.c	2014/06/29 22:12:54	1.85
--- src/usr.bin/mandoc/roff.c	2014/06/29 22:38:41	1.86
***************
*** 1,4 ****
! /*	$Id: roff.c,v 1.85 2014/06/29 22:12:54 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: roff.c,v 1.86 2014/06/29 22:38:41 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 906,919 ****
  static enum rofferr
  roff_block(ROFF_ARGS)
  {
! 	int		sv;
! 	size_t		sz;
! 	char		*name;
  
! 	name = NULL;
  
  	if (ROFF_ig != tok) {
! 		if ('\0' == (*bufp)[pos]) {
  			mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
  			return(ROFF_IGN);
  		}
--- 906,919 ----
  static enum rofferr
  roff_block(ROFF_ARGS)
  {
! 	char		*name, *cp;
! 	size_t		 namesz;
  
! 	name = cp = *bufp + pos;
! 	namesz = 0;
  
  	if (ROFF_ig != tok) {
! 		if ('\0' == *cp) {
  			mandoc_msg(MANDOCERR_NOARGS, r->parse, ln, ppos, NULL);
  			return(ROFF_IGN);
  		}
***************
*** 925,943 ****
  
  		if (ROFF_de1 == tok)
  			tok = ROFF_de;
! 		if (ROFF_de == tok)
! 			name = *bufp + pos;
! 		else
  			mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos,
  			    roffs[tok].name);
  
! 		while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))
! 			pos++;
  
- 		while (isspace((unsigned char)(*bufp)[pos]))
- 			(*bufp)[pos++] = '\0';
- 	}
- 
  	roffnode_push(r, tok, name, ln, ppos);
  
  	/*
--- 925,939 ----
  
  		if (ROFF_de1 == tok)
  			tok = ROFF_de;
! 		else if (ROFF_de != tok)
  			mandoc_msg(MANDOCERR_REQUEST, r->parse, ln, ppos,
  			    roffs[tok].name);
  
! 		namesz = roff_getname(r, &cp, ln, ppos);
! 		name[namesz] = '\0';
! 	} else
! 		name = NULL;
  
  	roffnode_push(r, tok, name, ln, ppos);
  
  	/*
***************
*** 946,981 ****
  	 * appended from roff_block_text() in multiline mode.
  	 */
  
! 	if (ROFF_de == tok)
! 		roff_setstr(r, name, "", 0);
  
! 	if ('\0' == (*bufp)[pos])
  		return(ROFF_IGN);
  
  	/* If present, process the custom end-of-line marker. */
  
! 	sv = pos;
! 	while ((*bufp)[pos] && ! isspace((unsigned char)(*bufp)[pos]))
! 		pos++;
  
! 	/*
! 	 * Note: groff does NOT like escape characters in the input.
! 	 * Instead of detecting this, we're just going to let it fly and
! 	 * to hell with it.
! 	 */
! 
! 	assert(pos > sv);
! 	sz = (size_t)(pos - sv);
! 
! 	if (1 == sz && '.' == (*bufp)[sv])
! 		return(ROFF_IGN);
! 
! 	r->last->end = mandoc_malloc(sz + 1);
! 
! 	memcpy(r->last->end, *bufp + sv, sz);
! 	r->last->end[(int)sz] = '\0';
! 
! 	if ((*bufp)[pos])
  		mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);
  
  	return(ROFF_IGN);
--- 942,961 ----
  	 * appended from roff_block_text() in multiline mode.
  	 */
  
! 	if (namesz && ROFF_de == tok)
! 		roff_setstrn(&r->strtab, name, namesz, "", 0, 0);
  
! 	if ('\0' == *cp)
  		return(ROFF_IGN);
  
  	/* If present, process the custom end-of-line marker. */
  
! 	name = cp;
! 	namesz = roff_getname(r, &cp, ln, ppos);
! 	if (namesz)
! 		r->last->end = mandoc_strndup(name, namesz);
  
! 	if ('\0' != *cp)
  		mandoc_msg(MANDOCERR_ARGSLOST, r->parse, ln, pos, NULL);
  
  	return(ROFF_IGN);