===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -c -r1.161 -r1.162
*** src/usr.bin/cvs/update.c	2010/07/13 21:33:44	1.161
--- src/usr.bin/cvs/update.c	2010/07/23 21:46:05	1.162
***************
*** 1,4 ****
! /*	$OpenBSD: update.c,v 1.161 2010/07/13 21:33:44 nicm Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: update.c,v 1.162 2010/07/23 21:46:05 ray Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 78,84 ****
  			break;
  		case 'D':
  			dateflag = optarg;
! 			cvs_specified_date = cvs_date_parse(dateflag);
  			reset_tag = 0;
  			break;
  		case 'd':
--- 78,84 ----
  			break;
  		case 'D':
  			dateflag = optarg;
! 			cvs_specified_date = date_parse(dateflag);
  			reset_tag = 0;
  			break;
  		case 'd':
***************
*** 529,536 ****
  	BUF *bp;
  	int conflict;
  	char *content;
! 	struct cvs_line *lp;
! 	struct cvs_lines *lines;
  	size_t len;
  
  	cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path);
--- 529,536 ----
  	BUF *bp;
  	int conflict;
  	char *content;
! 	struct rcs_line *lp;
! 	struct rcs_lines *lines;
  	size_t len;
  
  	cvs_log(LP_TRACE, "update_has_conflict_markers(%s)", cf->file_path);
***************
*** 538,548 ****
  	if (!(cf->file_flags & FILE_ON_DISK) || cf->file_ent == NULL)
  		return (0);
  
! 	bp = cvs_buf_load_fd(cf->fd);
  
! 	cvs_buf_putc(bp, '\0');
! 	len = cvs_buf_len(bp);
! 	content = cvs_buf_release(bp);
  	if ((lines = cvs_splitlines(content, len)) == NULL)
  		fatal("update_has_conflict_markers: failed to split lines");
  
--- 538,548 ----
  	if (!(cf->file_flags & FILE_ON_DISK) || cf->file_ent == NULL)
  		return (0);
  
! 	bp = buf_load_fd(cf->fd);
  
! 	buf_putc(bp, '\0');
! 	len = buf_len(bp);
! 	content = buf_release(bp);
  	if ((lines = cvs_splitlines(content, len)) == NULL)
  		fatal("update_has_conflict_markers: failed to split lines");
  
***************
*** 592,598 ****
  
  	if ((p = strchr(jrev2, ':')) != NULL) {
  		(*p++) = '\0';
! 		cvs_specified_date = cvs_date_parse(p);
  	}
  
  	rev2 = rcs_translate_tag(jrev2, cf->file_rcs);
--- 592,598 ----
  
  	if ((p = strchr(jrev2, ':')) != NULL) {
  		(*p++) = '\0';
! 		cvs_specified_date = date_parse(p);
  	}
  
  	rev2 = rcs_translate_tag(jrev2, cf->file_rcs);
***************
*** 601,607 ****
  	if (jrev1 != NULL) {
  		if ((p = strchr(jrev1, ':')) != NULL) {
  			(*p++) = '\0';
! 			cvs_specified_date = cvs_date_parse(p);
  		}
  
  		rev1 = rcs_translate_tag(jrev1, cf->file_rcs);
--- 601,607 ----
  	if (jrev1 != NULL) {
  		if ((p = strchr(jrev1, ':')) != NULL) {
  			(*p++) = '\0';
! 			cvs_specified_date = date_parse(p);
  		}
  
  		rev1 = rcs_translate_tag(jrev1, cf->file_rcs);