===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/checkout.c,v
retrieving revision 1.113
retrieving revision 1.114
diff -c -r1.113 -r1.114
*** src/usr.bin/cvs/checkout.c	2008/01/31 19:38:59	1.113
--- src/usr.bin/cvs/checkout.c	2008/01/31 19:49:05	1.114
***************
*** 1,4 ****
! /*	$OpenBSD: checkout.c,v 1.113 2008/01/31 19:38:59 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: checkout.c,v 1.114 2008/01/31 19:49:05 xsa Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 303,309 ****
  	struct timeval tv[2];
  	char *tosend;
  	char template[MAXPATHLEN], entry[CVS_ENT_MAXLINELEN];
! 	char kbuf[8], stickytag[32], rev[CVS_REV_BUFSZ];
  	char timebuf[CVS_TIME_BUFSZ], tbuf[CVS_TIME_BUFSZ];
  
  	exists = 0;
--- 303,309 ----
  	struct timeval tv[2];
  	char *tosend;
  	char template[MAXPATHLEN], entry[CVS_ENT_MAXLINELEN];
! 	char kbuf[8], sticky[32], rev[CVS_REV_BUFSZ];
  	char timebuf[CVS_TIME_BUFSZ], tbuf[CVS_TIME_BUFSZ];
  
  	exists = 0;
***************
*** 372,388 ****
  
  	if (co_flags & CO_SETSTICKY)
  		if (tag != NULL)
! 			(void)xsnprintf(stickytag, sizeof(stickytag), "T%s",
! 			    tag);
  		else
! 			(void)xsnprintf(stickytag, sizeof(stickytag), "T%s",
! 			    rev);
  	else if (!reset_stickies && cf->file_ent != NULL &&
  	    cf->file_ent->ce_tag != NULL)
! 		(void)xsnprintf(stickytag, sizeof(stickytag), "T%s",
  		    cf->file_ent->ce_tag);
  	else
! 		stickytag[0] = '\0';
  
  	kbuf[0] = '\0';
  	if (cf->file_ent != NULL) {
--- 372,386 ----
  
  	if (co_flags & CO_SETSTICKY)
  		if (tag != NULL)
! 			(void)xsnprintf(sticky, sizeof(sticky), "T%s", tag);
  		else
! 			(void)xsnprintf(sticky, sizeof(sticky), "T%s", rev);
  	else if (!reset_stickies && cf->file_ent != NULL &&
  	    cf->file_ent->ce_tag != NULL)
! 		(void)xsnprintf(sticky, sizeof(sticky), "T%s",
  		    cf->file_ent->ce_tag);
  	else
! 		sticky[0] = '\0';
  
  	kbuf[0] = '\0';
  	if (cf->file_ent != NULL) {
***************
*** 396,402 ****
  	}
  
  	(void)xsnprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s/%s/%s",
! 	    cf->file_name, rev, timebuf, kbuf, stickytag);
  
  	if (cvs_server_active == 0) {
  		if (!(co_flags & CO_REMOVE) && cvs_cmdop != CVS_OP_EXPORT) {
--- 394,400 ----
  	}
  
  	(void)xsnprintf(entry, CVS_ENT_MAXLINELEN, "/%s/%s/%s/%s/%s",
! 	    cf->file_name, rev, timebuf, kbuf, sticky);
  
  	if (cvs_server_active == 0) {
  		if (!(co_flags & CO_REMOVE) && cvs_cmdop != CVS_OP_EXPORT) {