===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rcs/diff3.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/rcs/diff3.c	2006/06/03 03:05:10	1.10
--- src/usr.bin/rcs/diff3.c	2006/07/08 09:25:44	1.11
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.10 2006/06/03 03:05:10 niallo Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.11 2006/07/08 09:25:44 ray Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.10 2006/06/03 03:05:10 niallo Exp $";
  #endif /* not lint */
  
  #include "includes.h"
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.11 2006/07/08 09:25:44 ray Exp $";
  #endif /* not lint */
  
  #include "includes.h"
***************
*** 181,189 ****
  	(void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);
  	(void)xasprintf(&path3, "%s/diff3.XXXXXXXXXX", rcs_tmpdir);
  
! 	rcs_buf_write_stmp(b1, path1, 0600);
! 	rcs_buf_write_stmp(b2, path2, 0600);
! 	rcs_buf_write_stmp(b3, path3, 0600);
  
  	rcs_buf_free(b2);
  	b2 = NULL;
--- 181,189 ----
  	(void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);
  	(void)xasprintf(&path3, "%s/diff3.XXXXXXXXXX", rcs_tmpdir);
  
! 	rcs_buf_write_stmp(b1, path1);
! 	rcs_buf_write_stmp(b2, path2);
! 	rcs_buf_write_stmp(b3, path3);
  
  	rcs_buf_free(b2);
  	b2 = NULL;
***************
*** 196,208 ****
  	}
  
  	(void)xasprintf(&dp13, "%s/d13.XXXXXXXXXX", rcs_tmpdir);
! 	rcs_buf_write_stmp(d1, dp13, 0600);
  
  	rcs_buf_free(d1);
  	d1 = NULL;
  
  	(void)xasprintf(&dp23, "%s/d23.XXXXXXXXXX", rcs_tmpdir);
! 	rcs_buf_write_stmp(d2, dp23, 0600);
  
  	rcs_buf_free(d2);
  	d2 = NULL;
--- 196,208 ----
  	}
  
  	(void)xasprintf(&dp13, "%s/d13.XXXXXXXXXX", rcs_tmpdir);
! 	rcs_buf_write_stmp(d1, dp13);
  
  	rcs_buf_free(d1);
  	d1 = NULL;
  
  	(void)xasprintf(&dp23, "%s/d23.XXXXXXXXXX", rcs_tmpdir);
! 	rcs_buf_write_stmp(d2, dp23);
  
  	rcs_buf_free(d2);
  	d2 = NULL;
***************
*** 296,304 ****
  	(void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);
  	(void)xasprintf(&path3, "%s/diff3.XXXXXXXXXX", rcs_tmpdir);
  
! 	rcs_buf_write_stmp(b1, path1, 0600);
! 	rcs_buf_write_stmp(b2, path2, 0600);
! 	rcs_buf_write_stmp(b3, path3, 0600);
  
  	rcs_buf_free(b2);
  	b2 = NULL;
--- 296,304 ----
  	(void)xasprintf(&path2, "%s/diff2.XXXXXXXXXX", rcs_tmpdir);
  	(void)xasprintf(&path3, "%s/diff3.XXXXXXXXXX", rcs_tmpdir);
  
! 	rcs_buf_write_stmp(b1, path1);
! 	rcs_buf_write_stmp(b2, path2);
! 	rcs_buf_write_stmp(b3, path3);
  
  	rcs_buf_free(b2);
  	b2 = NULL;
***************
*** 311,323 ****
  	}
  
  	(void)xasprintf(&dp13, "%s/d13.XXXXXXXXXX", rcs_tmpdir);
! 	rcs_buf_write_stmp(d1, dp13, 0600);
  
  	rcs_buf_free(d1);
  	d1 = NULL;
  
  	(void)xasprintf(&dp23, "%s/d23.XXXXXXXXXX", rcs_tmpdir);
! 	rcs_buf_write_stmp(d2, dp23, 0600);
  
  	rcs_buf_free(d2);
  	d2 = NULL;
--- 311,323 ----
  	}
  
  	(void)xasprintf(&dp13, "%s/d13.XXXXXXXXXX", rcs_tmpdir);
! 	rcs_buf_write_stmp(d1, dp13);
  
  	rcs_buf_free(d1);
  	d1 = NULL;
  
  	(void)xasprintf(&dp23, "%s/d23.XXXXXXXXXX", rcs_tmpdir);
! 	rcs_buf_write_stmp(d2, dp23);
  
  	rcs_buf_free(d2);
  	d2 = NULL;