===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/xmalloc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/cvs/xmalloc.c	2006/03/28 02:13:44	1.6
--- src/usr.bin/cvs/xmalloc.c	2007/01/29 16:22:29	1.7
***************
*** 1,4 ****
! /* $OpenBSD: xmalloc.c,v 1.6 2006/03/28 02:13:44 ray Exp $ */
  /*
   * Author: Tatu Ylonen <ylo@cs.hut.fi>
   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
--- 1,4 ----
! /* $OpenBSD: xmalloc.c,v 1.7 2007/01/29 16:22:29 xsa Exp $ */
  /*
   * Author: Tatu Ylonen <ylo@cs.hut.fi>
   * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
***************
*** 99,104 ****
--- 99,120 ----
  
  	if (i < 0 || *ret == NULL)
  		fatal("xasprintf: could not allocate memory");
+ 
+ 	return (i);
+ }
+ 
+ int
+ xsnprintf(char *str, size_t size, const char *fmt, ...)
+ {
+ 	va_list ap;
+ 	int i;
+ 
+ 	va_start(ap, fmt);
+ 	i = vsnprintf(str, size, fmt, ap);
+ 	va_end(ap);
+ 
+ 	if (i == -1 || i >= (int)size)
+ 		fatal("xsnprintf: overflow");
  
  	return (i);
  }