===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/update.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -c -r1.106 -r1.107
*** src/usr.bin/cvs/update.c	2007/08/23 13:11:14	1.106
--- src/usr.bin/cvs/update.c	2007/09/04 17:57:41	1.107
***************
*** 1,4 ****
! /*	$OpenBSD: update.c,v 1.106 2007/08/23 13:11:14 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: update.c,v 1.107 2007/09/04 17:57:41 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 452,462 ****
  			continue;
  
  		if (!strncmp(lp->l_line, RCS_CONFLICT_MARKER1,
! 		    strlen(RCS_CONFLICT_MARKER1)) ||
  		    !strncmp(lp->l_line, RCS_CONFLICT_MARKER2,
! 		    strlen(RCS_CONFLICT_MARKER2)) ||
  		    !strncmp(lp->l_line, RCS_CONFLICT_MARKER3,
! 		    strlen(RCS_CONFLICT_MARKER3))) {
  			conflict = 1;
  			break;
  		}
--- 452,462 ----
  			continue;
  
  		if (!strncmp(lp->l_line, RCS_CONFLICT_MARKER1,
! 		    sizeof(RCS_CONFLICT_MARKER1) - 1) ||
  		    !strncmp(lp->l_line, RCS_CONFLICT_MARKER2,
! 		    sizeof(RCS_CONFLICT_MARKER2) - 1) ||
  		    !strncmp(lp->l_line, RCS_CONFLICT_MARKER3,
! 		    sizeof(RCS_CONFLICT_MARKER3) - 1)) {
  			conflict = 1;
  			break;
  		}