===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/rcsparse.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -c -r1.7 -r1.8
*** src/usr.bin/cvs/rcsparse.c	2013/06/03 17:04:35	1.7
--- src/usr.bin/cvs/rcsparse.c	2014/11/16 19:14:34	1.8
***************
*** 1,4 ****
! /*	$OpenBSD: rcsparse.c,v 1.7 2013/06/03 17:04:35 jcs Exp $	*/
  /*
   * Copyright (c) 2010 Tobias Stoeckmann <tobias@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: rcsparse.c,v 1.8 2014/11/16 19:14:34 bluhm Exp $	*/
  /*
   * Copyright (c) 2010 Tobias Stoeckmann <tobias@openbsd.org>
   *
***************
*** 1259,1273 ****
  {
  	struct rcs_pdata *pdp;
  	va_list ap;
! 	char *nfmt;
  
  	pdp = (struct rcs_pdata *)rfp->rf_pdata;
  	va_start(ap, fmt);
! 	if (asprintf(&nfmt, "%s:%d: %s", rfp->rf_path, pdp->rp_msglineno, fmt)
! 	    == -1)
! 		nfmt = fmt;
! 	cvs_vlog(LP_ERR, nfmt, ap);
  	va_end(ap);
! 	if (nfmt != fmt)
! 		free(nfmt);
  }
--- 1259,1274 ----
  {
  	struct rcs_pdata *pdp;
  	va_list ap;
! 	char *msg;
  
  	pdp = (struct rcs_pdata *)rfp->rf_pdata;
  	va_start(ap, fmt);
! 	if (vasprintf(&msg, fmt, ap) == -1) {
! 		cvs_log(LP_ERRNO, "vasprintf");
! 		va_end(ap);
! 		return;
! 	}
  	va_end(ap);
! 	cvs_log(LP_ERR, "%s:%d: %s", rfp->rf_path, pdp->rp_msglineno, msg);
! 	free(msg);
  }