===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -c -r1.24 -r1.25
*** src/usr.bin/cvs/diff3.c	2006/05/27 03:30:30	1.24
--- src/usr.bin/cvs/diff3.c	2006/06/14 14:10:50	1.25
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.24 2006/05/27 03:30:30 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.25 2006/06/14 14:10:50 joris Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.24 2006/05/27 03:30:30 joris Exp $";
  #endif /* not lint */
  
  #include "includes.h"
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.25 2006/06/14 14:10:50 joris Exp $";
  #endif /* not lint */
  
  #include "includes.h"
***************
*** 155,161 ****
  int diff3_conflicts = 0;
  
  BUF *
! cvs_diff3(RCSFILE *rf, char *workfile, RCSNUM *rev1, RCSNUM *rev2, int verbose)
  {
  	int argc;
  	char *data, *patch;
--- 155,162 ----
  int diff3_conflicts = 0;
  
  BUF *
! cvs_diff3(RCSFILE *rf, char *workfile, int workfd, RCSNUM *rev1,
! 	RCSNUM *rev2, int verbose)
  {
  	int argc;
  	char *data, *patch;
***************
*** 169,175 ****
  	rcsnum_tostr(rev1, r1, sizeof(r1));
  	rcsnum_tostr(rev2, r2, sizeof(r2));
  
! 	if ((b1 = cvs_buf_load(workfile, BUF_AUTOEXT)) == NULL)
  		goto out;
  
  	if (verbose == 1)
--- 170,176 ----
  	rcsnum_tostr(rev1, r1, sizeof(r1));
  	rcsnum_tostr(rev2, r2, sizeof(r2));
  
! 	if ((b1 = cvs_buf_load_fd(workfd, BUF_AUTOEXT)) == NULL)
  		goto out;
  
  	if (verbose == 1)