===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/rcs.c,v
retrieving revision 1.259
retrieving revision 1.260
diff -c -r1.259 -r1.260
*** src/usr.bin/cvs/rcs.c	2008/03/08 20:52:36	1.259
--- src/usr.bin/cvs/rcs.c	2008/03/08 22:33:03	1.260
***************
*** 1,4 ****
! /*	$OpenBSD: rcs.c,v 1.259 2008/03/08 20:52:36 tobias Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcs.c,v 1.260 2008/03/08 22:33:03 joris Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 3461,3467 ****
  		fatal("rcs_translate_tag: cannot find revision");
  
  	if (cvs_specified_date == -1) {
- 
  		/* XXX */
  		if (rev->rn_len < 4) {
  			return (rev);
--- 3461,3466 ----
***************
*** 3499,3505 ****
  
  	if (frev != NULL) {
  		brev = rcsnum_revtobr(frev);
! 		brev->rn_len = rev->rn_len;
  	}
  
  	rcsnum_free(rev);
--- 3498,3504 ----
  
  	if (frev != NULL) {
  		brev = rcsnum_revtobr(frev);
! 		brev->rn_len = rev->rn_len - 1;
  	}
  
  	rcsnum_free(rev);
***************
*** 3512,3519 ****
--- 3511,3528 ----
  				trdp = TAILQ_PREV(rdp, rcs_dlist, rd_list);
  				if (trdp == NULL)
  					trdp = rdp;
+ 
+ 				if (trdp->rd_num->rn_len != rdp->rd_num->rn_len)
+ 					return (NULL);
+ 
  				rev = rcsnum_alloc();
  				rcsnum_cpy(trdp->rd_num, rev, 0);
+ 				return (rev);
+ 			}
+ 
+ 			if (rdp->rd_next->rn_len == 0) {
+ 				rev = rcsnum_alloc();
+ 				rcsnum_cpy(rdp->rd_num, rev, 0);
  				return (rev);
  			}
  		} else {