===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/diff3.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -c -r1.51 -r1.52
*** src/usr.bin/cvs/diff3.c	2009/10/27 23:59:37	1.51
--- src/usr.bin/cvs/diff3.c	2010/07/23 08:31:19	1.52
***************
*** 1,4 ****
! /*	$OpenBSD: diff3.c,v 1.51 2009/10/27 23:59:37 deraadt Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
--- 1,4 ----
! /*	$OpenBSD: diff3.c,v 1.52 2010/07/23 08:31:19 ray Exp $	*/
  
  /*
   * Copyright (C) Caldera International Inc.  2001-2002.
***************
*** 264,270 ****
  	for (i = 0; i < 3; i++)
  		fclose(fp[i]);
  
! 	cvs_worklist_run(&temp_files, cvs_worklist_unlink);
  
  	xfree(path1);
  	xfree(path2);
--- 264,270 ----
  	for (i = 0; i < 3; i++)
  		fclose(fp[i]);
  
! 	worklist_run(&temp_files, worklist_unlink);
  
  	xfree(path1);
  	xfree(path2);
***************
*** 375,381 ****
  			if (dlp->l_lineno == start)
  				break;
  			if (dlp->l_lineno > start) {
! 				dlp = TAILQ_PREV(dlp, cvs_tqh, l_list);
  			} else if (dlp->l_lineno < start) {
  				ndlp = TAILQ_NEXT(dlp, l_list);
  				if (ndlp->l_lineno > start)
--- 375,381 ----
  			if (dlp->l_lineno == start)
  				break;
  			if (dlp->l_lineno > start) {
! 				dlp = TAILQ_PREV(dlp, tqh, l_list);
  			} else if (dlp->l_lineno < start) {
  				ndlp = TAILQ_NEXT(dlp, l_list);
  				if (ndlp->l_lineno > start)
***************
*** 389,395 ****
  
  
  		if (op == 'c') {
! 			insert_after = TAILQ_PREV(dlp, cvs_tqh, l_list);
  			for (i = 0; i <= (end - start); i++) {
  				ndlp = TAILQ_NEXT(dlp, l_list);
  				TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);
--- 389,395 ----
  
  
  		if (op == 'c') {
! 			insert_after = TAILQ_PREV(dlp, tqh, l_list);
  			for (i = 0; i <= (end - start); i++) {
  				ndlp = TAILQ_NEXT(dlp, l_list);
  				TAILQ_REMOVE(&(dlines->l_lines), dlp, l_list);