===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -c -r1.9 -r1.10
*** src/usr.bin/cvs/diff3.c	2005/12/20 18:17:01	1.9
--- src/usr.bin/cvs/diff3.c	2005/12/24 04:10:51	1.10
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.9 2005/12/20 18:17:01 xsa Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.10 2005/12/24 04:10:51 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 71,77 ****
  #endif /* not lint */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff3.c,v 1.9 2005/12/20 18:17:01 xsa Exp $";
  #endif /* not lint */
  
  #include <sys/queue.h>
--- 71,77 ----
  #endif /* not lint */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff3.c,v 1.10 2005/12/24 04:10:51 joris Exp $";
  #endif /* not lint */
  
  #include <sys/queue.h>
***************
*** 187,200 ****
  	if ((b3 = rcs_getrev(rf, rev2)) == NULL)
  		goto out;
  
! 	if ((d1 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT)) == NULL)
! 		goto out;
! 
! 	if ((d2 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT)) == NULL)
! 		goto out;
! 
! 	if ((diffb = cvs_buf_alloc((size_t)128, BUF_AUTOEXT)) == NULL)
! 		goto out;
  
  	strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
  	cvs_buf_write_stmp(b1, path1, 0600);
--- 187,195 ----
  	if ((b3 = rcs_getrev(rf, rev2)) == NULL)
  		goto out;
  
! 	d1 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);
! 	d2 = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);
! 	diffb = cvs_buf_alloc((size_t)128, BUF_AUTOEXT);
  
  	strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
  	cvs_buf_write_stmp(b1, path1, 0600);