===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -c -r1.8 -r1.9
*** src/usr.bin/cvs/diff3.c	2005/12/10 20:27:45	1.8
--- src/usr.bin/cvs/diff3.c	2005/12/20 18:17:01	1.9
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.8 2005/12/10 20:27:45 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.9 2005/12/20 18:17:01 xsa Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 71,77 ****
  #endif /* not lint */
  
  #ifndef lint
! static const char rcsid[] = "$OpenBSD: diff3.c,v 1.8 2005/12/10 20:27:45 joris Exp $";
  #endif /* not lint */
  
  #include <sys/queue.h>
--- 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>
***************
*** 197,212 ****
  		goto out;
  
  	strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
! 	if (cvs_buf_write_stmp(b1, path1, 0600) == -1)
! 		goto out;
  
  	strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2));
! 	if (cvs_buf_write_stmp(b2, path2, 0600) == -1)
! 		goto out;
  
  	strlcpy(path3, "/tmp/diff3.XXXXXXXXXX", sizeof(path3));
! 	if (cvs_buf_write_stmp(b3, path3, 0600) == -1)
! 		goto out;
  
  	cvs_buf_free(b2);
  	b2 = NULL;
--- 197,209 ----
  		goto out;
  
  	strlcpy(path1, "/tmp/diff1.XXXXXXXXXX", sizeof(path1));
! 	cvs_buf_write_stmp(b1, path1, 0600);
  
  	strlcpy(path2, "/tmp/diff2.XXXXXXXXXX", sizeof(path2));
! 	cvs_buf_write_stmp(b2, path2, 0600);
  
  	strlcpy(path3, "/tmp/diff3.XXXXXXXXXX", sizeof(path3));
! 	cvs_buf_write_stmp(b3, path3, 0600);
  
  	cvs_buf_free(b2);
  	b2 = NULL;
***************
*** 215,229 ****
  	cvs_diffreg(path2, path3, d2);
  
  	strlcpy(dp13, "/tmp/d13.XXXXXXXXXX", sizeof(dp13));
! 	if (cvs_buf_write_stmp(d1, dp13, 0600) < 0)
! 		goto out;
  
  	cvs_buf_free(d1);
  	d1 = NULL;
  
  	strlcpy(dp23, "/tmp/d23.XXXXXXXXXX", sizeof(dp23));
! 	if (cvs_buf_write_stmp(d2, dp23, 0600) < 0)
! 		goto out;
  
  	cvs_buf_free(d2);
  	d2 = NULL;
--- 212,224 ----
  	cvs_diffreg(path2, path3, d2);
  
  	strlcpy(dp13, "/tmp/d13.XXXXXXXXXX", sizeof(dp13));
! 	cvs_buf_write_stmp(d1, dp13, 0600);
  
  	cvs_buf_free(d1);
  	d1 = NULL;
  
  	strlcpy(dp23, "/tmp/d23.XXXXXXXXXX", sizeof(dp23));
! 	cvs_buf_write_stmp(d2, dp23, 0600);
  
  	cvs_buf_free(d2);
  	d2 = NULL;
***************
*** 243,259 ****
  		goto out;
  	}
  
! 	if (cvs_buf_putc(diffb, '\0') < 0) {
! 		cvs_buf_free(diffb);
! 		diffb = NULL;
! 		goto out;
! 	}
! 
! 	if (cvs_buf_putc(b1, '\0') < 0) {
! 		cvs_buf_free(diffb);
! 		diffb = NULL;
! 		goto out;
! 	}
  
  	patch = cvs_buf_release(diffb);
  	data = cvs_buf_release(b1);
--- 238,245 ----
  		goto out;
  	}
  
! 	cvs_buf_putc(diffb, '\0');
! 	cvs_buf_putc(b1, '\0');
  
  	patch = cvs_buf_release(diffb);
  	data = cvs_buf_release(b1);