===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/checkout.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -c -r1.148 -r1.149
*** src/usr.bin/cvs/checkout.c	2008/06/10 20:30:17	1.148
--- src/usr.bin/cvs/checkout.c	2008/06/11 02:19:13	1.149
***************
*** 1,4 ****
! /*	$OpenBSD: checkout.c,v 1.148 2008/06/10 20:30:17 joris Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
--- 1,4 ----
! /*	$OpenBSD: checkout.c,v 1.149 2008/06/11 02:19:13 tobias Exp $	*/
  /*
   * Copyright (c) 2006 Joris Vink <joris@openbsd.org>
   *
***************
*** 25,30 ****
--- 25,31 ----
  #include <libgen.h>
  #include <stdlib.h>
  #include <string.h>
+ #include <time.h>
  #include <unistd.h>
  
  #include "cvs.h"
***************
*** 435,441 ****
  	time_t rcstime;
  	CVSENTRIES *ent;
  	struct timeval tv[2];
! 	struct tm *datetm;
  	char *tosend;
  	char template[MAXPATHLEN], *entry;
  	char kbuf[8], sticky[CVS_REV_BUFSZ], rev[CVS_REV_BUFSZ];
--- 436,442 ----
  	time_t rcstime;
  	CVSENTRIES *ent;
  	struct timeval tv[2];
! 	struct tm datetm;
  	char *tosend;
  	char template[MAXPATHLEN], *entry;
  	char kbuf[8], sticky[CVS_REV_BUFSZ], rev[CVS_REV_BUFSZ];
***************
*** 498,504 ****
  		time(&rcstime);
  	}
  
! 	asctime_r(gmtime(&rcstime), tbuf);
  	tbuf[strcspn(tbuf, "\n")] = '\0';
  
  	if (co_flags & CO_MERGE) {
--- 499,506 ----
  		time(&rcstime);
  	}
  
! 	gmtime_r(&rcstime, &datetm);
! 	asctime_r(&datetm, tbuf);
  	tbuf[strcspn(tbuf, "\n")] = '\0';
  
  	if (co_flags & CO_MERGE) {
***************
*** 512,520 ****
  		if (tag != NULL)
  			(void)xsnprintf(sticky, sizeof(sticky), "T%s", tag);
  		else if (cvs_specified_date != -1) {
! 			datetm = gmtime(&cvs_specified_date);
  			(void)strftime(sticky, sizeof(sticky),
! 			    "D"CVS_DATE_FMT, datetm);
  		} else
  			(void)xsnprintf(sticky, sizeof(sticky), "T%s", rev);
  	else if (!reset_tag && cf->file_ent != NULL &&
--- 514,522 ----
  		if (tag != NULL)
  			(void)xsnprintf(sticky, sizeof(sticky), "T%s", tag);
  		else if (cvs_specified_date != -1) {
! 			gmtime_r(&cvs_specified_date, &datetm);
  			(void)strftime(sticky, sizeof(sticky),
! 			    "D"CVS_DATE_FMT, &datetm);
  		} else
  			(void)xsnprintf(sticky, sizeof(sticky), "T%s", rev);
  	else if (!reset_tag && cf->file_ent != NULL &&