===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -c -r1.39 -r1.40
*** src/usr.bin/cvs/diff3.c	2007/09/17 10:07:21	1.39
--- src/usr.bin/cvs/diff3.c	2008/02/11 20:33:11	1.40
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.39 2007/09/17 10:07:21 tobias Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.40 2008/02/11 20:33:11 tobias Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 72,78 ****
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.39 2007/09/17 10:07:21 tobias Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
--- 72,78 ----
  
  #ifndef lint
  static const char rcsid[] =
!     "$OpenBSD: diff3.c,v 1.40 2008/02/11 20:33:11 tobias Exp $";
  #endif /* not lint */
  
  #include <ctype.h>
***************
*** 176,185 ****
  	rcsnum_tostr(cf->file_ent->ce_rev, r1, sizeof(r1));
  	rcsnum_tostr(cf->file_rcsrev, r2, sizeof(r2));
  
! 	b1 = cvs_buf_load_fd(cf->fd, BUF_AUTOEXT);
! 	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);
  
  	(void)close(cf->fd);
  	cf->fd = open(cf->file_path, O_WRONLY | O_TRUNC);
--- 176,185 ----
  	rcsnum_tostr(cf->file_ent->ce_rev, r1, sizeof(r1));
  	rcsnum_tostr(cf->file_rcsrev, r2, sizeof(r2));
  
! 	b1 = cvs_buf_load_fd(cf->fd);
! 	d1 = cvs_buf_alloc(128);
! 	d2 = cvs_buf_alloc(128);
! 	diffb = cvs_buf_alloc(128);
  
  	(void)close(cf->fd);
  	cf->fd = open(cf->file_path, O_WRONLY | O_TRUNC);