===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/rcs.c,v
retrieving revision 1.282
retrieving revision 1.283
diff -c -r1.282 -r1.283
*** src/usr.bin/cvs/rcs.c	2008/11/09 08:51:43	1.282
--- src/usr.bin/cvs/rcs.c	2009/01/02 00:11:01	1.283
***************
*** 1,4 ****
! /*	$OpenBSD: rcs.c,v 1.282 2008/11/09 08:51:43 tobias Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
--- 1,4 ----
! /*	$OpenBSD: rcs.c,v 1.283 2009/01/02 00:11:01 canacar Exp $	*/
  /*
   * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org>
   * All rights reserved.
***************
*** 3179,3185 ****
  	const u_char *c, *start, *fin, *end;
  	char *kwstr;
  	char expbuf[256], buf[256];
- 	char *fmt;
  	size_t clen, kwlen, len, tlen;
  
  	kwtype = 0;
--- 3179,3184 ----
***************
*** 3314,3322 ****
  			}
  
  			if (kwtype & RCS_KW_DATE) {
! 				fmt = "%Y/%m/%d %H:%M:%S ";
! 
! 				if (strftime(buf, sizeof(buf), fmt,
  				    &rdp->rd_date) == 0)
  					fatal("rcs_kwexp_line: strftime "
  					    "failure");
--- 3313,3320 ----
  			}
  
  			if (kwtype & RCS_KW_DATE) {
! 				if (strftime(buf, sizeof(buf),
! 				    "%Y/%m/%d %H:%M:%S ",
  				    &rdp->rd_date) == 0)
  					fatal("rcs_kwexp_line: strftime "
  					    "failure");
***************
*** 3332,3343 ****
  				 * digit, %e would do so and there is
  				 * no better format for strftime().
  				 */
! 				if (rdp->rd_date.tm_mday < 10)
! 					fmt = "%B%e %Y ";
! 				else
! 					fmt = "%B %e %Y ";
! 
! 				if (strftime(buf, sizeof(buf), fmt,
  				    &rdp->rd_date) == 0)
  					fatal("rcs_kwexp_line: strftime "
  					    "failure");
--- 3330,3338 ----
  				 * digit, %e would do so and there is
  				 * no better format for strftime().
  				 */
! 				if (strftime(buf, sizeof(buf),
! 				    (rdp->rd_date.tm_mday < 10) ?
! 				        "%B%e %Y " : "%B %e %Y",
  				    &rdp->rd_date) == 0)
  					fatal("rcs_kwexp_line: strftime "
  					    "failure");
***************
*** 3411,3418 ****
  				if (strlcat(linebuf, buf, sizeof(linebuf))
  				    >= sizeof(buf))
  					fatal("rcs_kwexp_line: truncated");
! 				fmt = "  %Y/%m/%d %H:%M:%S  ";
! 				if (strftime(buf, sizeof(buf), fmt,
  				    &rdp->rd_date) == 0)
  					fatal("rcs_kwexp_line: strftime "
  					    "failure");
--- 3406,3413 ----
  				if (strlcat(linebuf, buf, sizeof(linebuf))
  				    >= sizeof(buf))
  					fatal("rcs_kwexp_line: truncated");
! 				if (strftime(buf, sizeof(buf),
! 				    "  %Y/%m/%d %H:%M:%S  ",
  				    &rdp->rd_date) == 0)
  					fatal("rcs_kwexp_line: strftime "
  					    "failure");