===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/tbl_data.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -c -r1.23 -r1.24
*** src/usr.bin/mandoc/tbl_data.c	2015/01/28 17:30:37	1.23
--- src/usr.bin/mandoc/tbl_data.c	2015/01/30 02:08:37	1.24
***************
*** 1,4 ****
! /*	$OpenBSD: tbl_data.c,v 1.23 2015/01/28 17:30:37 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: tbl_data.c,v 1.24 2015/01/30 02:08:37 schwarze Exp $ */
  /*
   * Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 40,59 ****
  {
  	struct tbl_dat	*dat;
  	struct tbl_cell	*cp;
! 	int		 sv, spans;
  
! 	cp = NULL;
! 	if (dp->last && dp->last->layout)
! 		cp = dp->last->layout->next;
! 	else if (NULL == dp->last)
! 		cp = dp->layout->first;
  
  	/*
  	 * Skip over spanners, since
  	 * we want to match data with data layout cells in the header.
  	 */
  
! 	while (cp && TBL_CELL_SPAN == cp->pos)
  		cp = cp->next;
  
  	/*
--- 40,55 ----
  {
  	struct tbl_dat	*dat;
  	struct tbl_cell	*cp;
! 	int		 sv;
  
! 	cp = dp->last == NULL ? dp->layout->first : dp->last->layout->next;
  
  	/*
  	 * Skip over spanners, since
  	 * we want to match data with data layout cells in the header.
  	 */
  
! 	while (cp != NULL && cp->pos == TBL_CELL_SPAN)
  		cp = cp->next;
  
  	/*
***************
*** 61,67 ****
  	 * cells.  This means that we have extra input.
  	 */
  
! 	if (NULL == cp) {
  		mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse,
  		    ln, *pos, p + *pos);
  		/* Skip to the end... */
--- 57,63 ----
  	 * cells.  This means that we have extra input.
  	 */
  
! 	if (cp == NULL) {
  		mandoc_msg(MANDOCERR_TBLDATA_EXTRA, tbl->parse,
  		    ln, *pos, p + *pos);
  		/* Skip to the end... */
***************
*** 70,94 ****
  		return;
  	}
  
! 	dat = mandoc_calloc(1, sizeof(struct tbl_dat));
  	dat->layout = cp;
  	dat->pos = TBL_DATA_NONE;
! 
! 	assert(TBL_CELL_SPAN != cp->pos);
! 
! 	for (spans = 0, cp = cp->next; cp; cp = cp->next)
! 		if (TBL_CELL_SPAN == cp->pos)
! 			spans++;
  		else
  			break;
  
! 	dat->spans = spans;
! 
! 	if (dp->last) {
  		dp->last->next = dat;
! 		dp->last = dat;
! 	} else
! 		dp->last = dp->first = dat;
  
  	sv = *pos;
  	while (p[*pos] && p[*pos] != tbl->opts.tab)
--- 66,86 ----
  		return;
  	}
  
! 	dat = mandoc_calloc(1, sizeof(*dat));
  	dat->layout = cp;
  	dat->pos = TBL_DATA_NONE;
! 	dat->spans = 0;
! 	for (cp = cp->next; cp != NULL; cp = cp->next)
! 		if (cp->pos == TBL_CELL_SPAN)
! 			dat->spans++;
  		else
  			break;
  
! 	if (dp->last == NULL)
! 		dp->first = dat;
! 	else
  		dp->last->next = dat;
! 	dp->last = dat;
  
  	sv = *pos;
  	while (p[*pos] && p[*pos] != tbl->opts.tab)
***************
*** 100,116 ****
  	 * until a standalone `T}', are included in our cell.
  	 */
  
! 	if (*pos - sv == 2 && 'T' == p[sv] && '{' == p[sv + 1]) {
  		tbl->part = TBL_PART_CDATA;
  		return;
  	}
  
! 	assert(*pos - sv >= 0);
  
- 	dat->string = mandoc_malloc((size_t)(*pos - sv + 1));
- 	memcpy(dat->string, &p[sv], (size_t)(*pos - sv));
- 	dat->string[*pos - sv] = '\0';
- 
  	if (p[*pos])
  		(*pos)++;
  
--- 92,104 ----
  	 * until a standalone `T}', are included in our cell.
  	 */
  
! 	if (*pos - sv == 2 && p[sv] == 'T' && p[sv + 1] == '{') {
  		tbl->part = TBL_PART_CDATA;
  		return;
  	}
  
! 	dat->string = mandoc_strndup(p + sv, *pos - sv);
  
  	if (p[*pos])
  		(*pos)++;
  
***************
*** 125,138 ****
  	else
  		dat->pos = TBL_DATA_DATA;
  
! 	if (TBL_CELL_HORIZ == dat->layout->pos ||
! 	    TBL_CELL_DHORIZ == dat->layout->pos ||
! 	    TBL_CELL_DOWN == dat->layout->pos)
! 		if (TBL_DATA_DATA == dat->pos && '\0' != *dat->string)
! 			mandoc_msg(MANDOCERR_TBLDATA_SPAN,
! 			    tbl->parse, ln, sv, dat->string);
! 
! 	return;
  }
  
  int
--- 113,124 ----
  	else
  		dat->pos = TBL_DATA_DATA;
  
! 	if ((dat->layout->pos == TBL_CELL_HORIZ ||
! 	    dat->layout->pos == TBL_CELL_DHORIZ ||
! 	    dat->layout->pos == TBL_CELL_DOWN) &&
! 	    dat->pos == TBL_DATA_DATA && *dat->string != '\0')
! 		mandoc_msg(MANDOCERR_TBLDATA_SPAN,
! 		    tbl->parse, ln, sv, dat->string);
  }
  
  int
***************
*** 150,156 ****
  			pos++;
  			getdata(tbl, tbl->last_span, ln, p, &pos);
  			return(1);
! 		} else if ('\0' == p[pos]) {
  			tbl->part = TBL_PART_DATA;
  			return(1);
  		}
--- 136,142 ----
  			pos++;
  			getdata(tbl, tbl->last_span, ln, p, &pos);
  			return(1);
! 		} else if (p[pos] == '\0') {
  			tbl->part = TBL_PART_DATA;
  			return(1);
  		}
***************
*** 160,166 ****
  
  	dat->pos = TBL_DATA_DATA;
  
! 	if (dat->string) {
  		sz = strlen(p + pos) + strlen(dat->string) + 2;
  		dat->string = mandoc_realloc(dat->string, sz);
  		(void)strlcat(dat->string, " ", sz);
--- 146,152 ----
  
  	dat->pos = TBL_DATA_DATA;
  
! 	if (dat->string != NULL) {
  		sz = strlen(p + pos) + strlen(dat->string) + 2;
  		dat->string = mandoc_realloc(dat->string, sz);
  		(void)strlcat(dat->string, " ", sz);
***************
*** 168,174 ****
  	} else
  		dat->string = mandoc_strdup(p + pos);
  
! 	if (TBL_CELL_DOWN == dat->layout->pos)
  		mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
  		    ln, pos, dat->string);
  
--- 154,160 ----
  	} else
  		dat->string = mandoc_strdup(p + pos);
  
! 	if (dat->layout->pos == TBL_CELL_DOWN)
  		mandoc_msg(MANDOCERR_TBLDATA_SPAN, tbl->parse,
  		    ln, pos, dat->string);
  
***************
*** 180,186 ****
  {
  	struct tbl_span	*dp;
  
! 	dp = mandoc_calloc(1, sizeof(struct tbl_span));
  	dp->line = line;
  	dp->opts = &tbl->opts;
  	dp->layout = rp;
--- 166,172 ----
  {
  	struct tbl_span	*dp;
  
! 	dp = mandoc_calloc(1, sizeof(*dp));
  	dp->line = line;
  	dp->opts = &tbl->opts;
  	dp->layout = rp;
***************
*** 212,222 ****
  	 * (it doesn't "consume" the layout).
  	 */
  
! 	if (tbl->last_span) {
! 		assert(tbl->last_span->layout);
  		if (tbl->last_span->pos == TBL_SPAN_DATA) {
  			for (rp = tbl->last_span->layout->next;
! 					rp && rp->first; rp = rp->next) {
  				switch (rp->first->pos) {
  				case TBL_CELL_HORIZ:
  					dp = newspan(tbl, ln, rp);
--- 198,208 ----
  	 * (it doesn't "consume" the layout).
  	 */
  
! 	if (tbl->last_span != NULL) {
  		if (tbl->last_span->pos == TBL_SPAN_DATA) {
  			for (rp = tbl->last_span->layout->next;
! 			     rp != NULL && rp->first != NULL;
! 			     rp = rp->next) {
  				switch (rp->first->pos) {
  				case TBL_CELL_HORIZ:
  					dp = newspan(tbl, ln, rp);
***************
*** 234,240 ****
  		} else
  			rp = tbl->last_span->layout;
  
! 		if (NULL == rp)
  			rp = tbl->last_span->layout;
  	} else
  		rp = tbl->first_row;
--- 220,226 ----
  		} else
  			rp = tbl->last_span->layout;
  
! 		if (rp == NULL)
  			rp = tbl->last_span->layout;
  	} else
  		rp = tbl->first_row;
***************
*** 253,258 ****
  
  	dp->pos = TBL_SPAN_DATA;
  
! 	while ('\0' != p[pos])
  		getdata(tbl, dp, ln, p, &pos);
  }
--- 239,244 ----
  
  	dp->pos = TBL_SPAN_DATA;
  
! 	while (p[pos] != '\0')
  		getdata(tbl, dp, ln, p, &pos);
  }