===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/eqn.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/mandoc/eqn.c	2014/03/21 22:17:01	1.6
--- src/usr.bin/mandoc/eqn.c	2014/04/20 16:44:44	1.7
***************
*** 1,4 ****
! /*	$Id: eqn.c,v 1.6 2014/03/21 22:17:01 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: eqn.c,v 1.7 2014/04/20 16:44:44 schwarze Exp $ */
  /*
   * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 134,145 ****
  	const char	*sym;
  };
  
- 
  static	enum eqn_rest	 eqn_box(struct eqn_node *, struct eqn_box *);
! static	struct eqn_box	*eqn_box_alloc(struct eqn_node *, 
  				struct eqn_box *);
  static	void		 eqn_box_free(struct eqn_box *);
! static	struct eqn_def	*eqn_def_find(struct eqn_node *, 
  				const char *, size_t);
  static	int		 eqn_do_gfont(struct eqn_node *);
  static	int		 eqn_do_gsize(struct eqn_node *);
--- 134,144 ----
  	const char	*sym;
  };
  
  static	enum eqn_rest	 eqn_box(struct eqn_node *, struct eqn_box *);
! static	struct eqn_box	*eqn_box_alloc(struct eqn_node *,
  				struct eqn_box *);
  static	void		 eqn_box_free(struct eqn_box *);
! static	struct eqn_def	*eqn_def_find(struct eqn_node *,
  				const char *, size_t);
  static	int		 eqn_do_gfont(struct eqn_node *);
  static	int		 eqn_do_gsize(struct eqn_node *);
***************
*** 153,159 ****
  static	enum eqn_rest	 eqn_matrix(struct eqn_node *, struct eqn_box *);
  static	const char	*eqn_nexttok(struct eqn_node *, size_t *);
  static	const char	*eqn_nextrawtok(struct eqn_node *, size_t *);
! static	const char	*eqn_next(struct eqn_node *, 
  				char, size_t *, int);
  static	void		 eqn_rewind(struct eqn_node *);
  
--- 152,158 ----
  static	enum eqn_rest	 eqn_matrix(struct eqn_node *, struct eqn_box *);
  static	const char	*eqn_nexttok(struct eqn_node *, size_t *);
  static	const char	*eqn_nextrawtok(struct eqn_node *, size_t *);
! static	const char	*eqn_next(struct eqn_node *,
  				char, size_t *, int);
  static	void		 eqn_rewind(struct eqn_node *);
  
***************
*** 274,282 ****
  	{ { ">=", 2 }, ">=" }, /* EQNSYM_moreequal */
  };
  
! /* ARGSUSED */
  enum rofferr
! eqn_read(struct eqn_node **epp, int ln, 
  		const char *p, int pos, int *offs)
  {
  	size_t		 sz;
--- 273,281 ----
  	{ { ">=", 2 }, ">=" }, /* EQNSYM_moreequal */
  };
  
! 
  enum rofferr
! eqn_read(struct eqn_node **epp, int ln,
  		const char *p, int pos, int *offs)
  {
  	size_t		 sz;
***************
*** 295,301 ****
  		p += 3;
  		while (' ' == *p || '\t' == *p)
  			p++;
! 		if ('\0' == *p) 
  			return(er);
  		mandoc_msg(MANDOCERR_ARGSLOST, ep->parse, ln, pos, NULL);
  		return(er);
--- 294,300 ----
  		p += 3;
  		while (' ' == *p || '\t' == *p)
  			p++;
! 		if ('\0' == *p)
  			return(er);
  		mandoc_msg(MANDOCERR_ARGSLOST, ep->parse, ln, pos, NULL);
  		return(er);
***************
*** 410,420 ****
  
  	while (EQN_OK == (c = eqn_box(ep, bp)))
  		switch (bp->last->pile) {
! 		case (EQNPILE_LCOL):
  			/* FALLTHROUGH */
! 		case (EQNPILE_CCOL):
  			/* FALLTHROUGH */
! 		case (EQNPILE_RCOL):
  			continue;
  		default:
  			EQN_MSG(MANDOCERR_EQNSYNT, ep);
--- 409,419 ----
  
  	while (EQN_OK == (c = eqn_box(ep, bp)))
  		switch (bp->last->pile) {
! 		case EQNPILE_LCOL:
  			/* FALLTHROUGH */
! 		case EQNPILE_CCOL:
  			/* FALLTHROUGH */
! 		case EQNPILE_RCOL:
  			continue;
  		default:
  			EQN_MSG(MANDOCERR_EQNSYNT, ep);
***************
*** 509,517 ****
  	for (i = 0; i < (int)EQN__MAX; i++) {
  		if ( ! EQNSTREQ(&eqnparts[i].str, start, sz))
  			continue;
! 		return((*eqnparts[i].fp)(ep) ? 
! 				EQN_OK : EQN_ERR);
! 	} 
  
  	if (STRNEQ(start, sz, "{", 1)) {
  		if (EQN_DESCOPE != (c = eqn_eqn(ep, last))) {
--- 508,515 ----
  	for (i = 0; i < (int)EQN__MAX; i++) {
  		if ( ! EQNSTREQ(&eqnparts[i].str, start, sz))
  			continue;
! 		return((*eqnparts[i].fp)(ep) ? EQN_OK : EQN_ERR);
! 	}
  
  	if (STRNEQ(start, sz, "{", 1)) {
  		if (EQN_DESCOPE != (c = eqn_eqn(ep, last))) {
***************
*** 526,532 ****
  			return(EQN_OK);
  		EQN_MSG(MANDOCERR_EQNBADSCOPE, ep);
  		return(EQN_ERR);
! 	} 
  
  	for (i = 0; i < (int)EQNPILE__MAX; i++) {
  		if ( ! EQNSTREQ(&eqnpiles[i], start, sz))
--- 524,530 ----
  			return(EQN_OK);
  		EQN_MSG(MANDOCERR_EQNBADSCOPE, ep);
  		return(EQN_ERR);
! 	}
  
  	for (i = 0; i < (int)EQNPILE__MAX; i++) {
  		if ( ! EQNSTREQ(&eqnpiles[i], start, sz))
***************
*** 572,578 ****
  		if (NULL == last->last) {
  			EQN_MSG(MANDOCERR_EQNSYNT, ep);
  			return(EQN_ERR);
! 		} 
  		last->last->pos = (enum eqn_post)i;
  		if (EQN_EOF == (c = eqn_box(ep, last))) {
  			EQN_MSG(MANDOCERR_EQNEOF, ep);
--- 570,576 ----
  		if (NULL == last->last) {
  			EQN_MSG(MANDOCERR_EQNSYNT, ep);
  			return(EQN_ERR);
! 		}
  		last->last->pos = (enum eqn_post)i;
  		if (EQN_EOF == (c = eqn_box(ep, last))) {
  			EQN_MSG(MANDOCERR_EQNEOF, ep);
***************
*** 587,593 ****
  		if (NULL == last->last) {
  			EQN_MSG(MANDOCERR_EQNSYNT, ep);
  			return(EQN_ERR);
! 		} 
  		last->last->mark = (enum eqn_markt)i;
  		if (EQN_EOF == (c = eqn_box(ep, last))) {
  			EQN_MSG(MANDOCERR_EQNEOF, ep);
--- 585,591 ----
  		if (NULL == last->last) {
  			EQN_MSG(MANDOCERR_EQNSYNT, ep);
  			return(EQN_ERR);
! 		}
  		last->last->mark = (enum eqn_markt)i;
  		if (EQN_EOF == (c = eqn_box(ep, last))) {
  			EQN_MSG(MANDOCERR_EQNEOF, ep);
***************
*** 759,767 ****
  		if (q)
  			ep->cur++;
  		while (' ' == ep->data[(int)ep->cur] ||
! 				'\t' == ep->data[(int)ep->cur] ||
! 				'^' == ep->data[(int)ep->cur] ||
! 				'~' == ep->data[(int)ep->cur])
  			ep->cur++;
  	} else {
  		if (q)
--- 757,765 ----
  		if (q)
  			ep->cur++;
  		while (' ' == ep->data[(int)ep->cur] ||
! 		    '\t' == ep->data[(int)ep->cur] ||
! 		    '^' == ep->data[(int)ep->cur] ||
! 		    '~' == ep->data[(int)ep->cur])
  			ep->cur++;
  	} else {
  		if (q)
***************
*** 787,794 ****
  		}
  
  		diff = def->valsz - *sz;
! 		memmove(start + *sz + diff, start + *sz, 
! 				(strlen(start) - *sz) + 1);
  		memcpy(start, def->val, def->valsz);
  		goto again;
  	}
--- 785,792 ----
  		}
  
  		diff = def->valsz - *sz;
! 		memmove(start + *sz + diff, start + *sz,
! 		    (strlen(start) - *sz) + 1);
  		memcpy(start, def->val, def->valsz);
  		goto again;
  	}
***************
*** 849,856 ****
  		return(0);
  	}
  
! 	/* 
! 	 * Search for a key that already exists. 
  	 * Create a new key if none is found.
  	 */
  
--- 847,854 ----
  		return(0);
  	}
  
! 	/*
! 	 * Search for a key that already exists.
  	 * Create a new key if none is found.
  	 */
  
***************
*** 862,876 ****
  
  		if (i == (int)ep->defsz) {
  			ep->defsz++;
! 			ep->defs = mandoc_realloc
! 				(ep->defs, ep->defsz * 
! 				 sizeof(struct eqn_def));
  			ep->defs[i].key = ep->defs[i].val = NULL;
  		}
  
  		ep->defs[i].keysz = sz;
! 		ep->defs[i].key = mandoc_realloc
! 			(ep->defs[i].key, sz + 1);
  
  		memcpy(ep->defs[i].key, start, sz);
  		ep->defs[i].key[(int)sz] = '\0';
--- 860,873 ----
  
  		if (i == (int)ep->defsz) {
  			ep->defsz++;
! 			ep->defs = mandoc_realloc(ep->defs,
! 			    ep->defsz * sizeof(struct eqn_def));
  			ep->defs[i].key = ep->defs[i].val = NULL;
  		}
  
  		ep->defs[i].keysz = sz;
! 		ep->defs[i].key = mandoc_realloc(
! 		    ep->defs[i].key, sz + 1);
  
  		memcpy(ep->defs[i].key, start, sz);
  		ep->defs[i].key[(int)sz] = '\0';
***************
*** 898,904 ****
  	if (NULL == eqn_nextrawtok(ep, NULL)) {
  		EQN_MSG(MANDOCERR_EQNEOF, ep);
  		return(0);
! 	} 
  	return(1);
  }
  
--- 895,901 ----
  	if (NULL == eqn_nextrawtok(ep, NULL)) {
  		EQN_MSG(MANDOCERR_EQNEOF, ep);
  		return(0);
! 	}
  	return(1);
  }
  
***************
*** 911,917 ****
  	if (NULL == (start = eqn_nextrawtok(ep, &sz))) {
  		EQN_MSG(MANDOCERR_EQNEOF, ep);
  		return(0);
! 	} 
  	ep->gsize = mandoc_strntoi(start, sz, 10);
  	return(1);
  }
--- 908,914 ----
  	if (NULL == (start = eqn_nextrawtok(ep, &sz))) {
  		EQN_MSG(MANDOCERR_EQNEOF, ep);
  		return(0);
! 	}
  	ep->gsize = mandoc_strntoi(start, sz, 10);
  	return(1);
  }
***************
*** 937,945 ****
  {
  	int		 i;
  
! 	for (i = 0; i < (int)ep->defsz; i++) 
! 		if (ep->defs[i].keysz && STRNEQ(ep->defs[i].key, 
! 					ep->defs[i].keysz, key, sz))
  			return(&ep->defs[i]);
  
  	return(NULL);
--- 934,942 ----
  {
  	int		 i;
  
! 	for (i = 0; i < (int)ep->defsz; i++)
! 		if (ep->defs[i].keysz && STRNEQ(ep->defs[i].key,
! 		    ep->defs[i].keysz, key, sz))
  			return(&ep->defs[i]);
  
  	return(NULL);