diff options
| -rw-r--r-- | usr.bin/cvs/checkout.c | 4 | ||||
| -rw-r--r-- | usr.bin/cvs/rcs.c | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/usr.bin/cvs/checkout.c b/usr.bin/cvs/checkout.c index bebfab3077b..b6d98afab33 100644 --- a/usr.bin/cvs/checkout.c +++ b/usr.bin/cvs/checkout.c @@ -1,4 +1,4 @@ -/* $OpenBSD: checkout.c,v 1.54 2006/05/27 05:20:25 joris Exp $ */ +/* $OpenBSD: checkout.c,v 1.55 2006/05/27 05:59:32 joris Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -128,6 +128,8 @@ cvs_checkout_file(struct cvs_file *cf, RCSNUM *rnum, int flags) return (0); } + bp = rcs_kwexp_buf(bp, cf->file_rcs, rnum); + oflags = O_WRONLY | O_TRUNC; if (cf->fd != -1) { exists = 1; diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index 7105e2918ab..a2e8afa123d 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.172 2006/05/27 03:30:31 joris Exp $ */ +/* $OpenBSD: rcs.c,v 1.173 2006/05/27 05:59:32 joris Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -2577,7 +2577,6 @@ rcs_expand_keywords(char *rcsfile, struct rcs_delta *rdp, char *data, u_int j, found; char *c, *kwstr, *start, *end, *tbuf; char expbuf[256], buf[256]; - struct tm tb; char *fmt; kwtype = 0; @@ -2694,7 +2693,8 @@ rcs_expand_keywords(char *rcsfile, struct rcs_delta *rdp, char *data, if (kwtype & RCS_KW_DATE) { fmt = "%Y/%m/%d %H:%M:%S "; - strftime(buf, sizeof(buf), fmt, &tb); + strftime(buf, sizeof(buf), fmt, + &rdp->rd_date); if (strlcat(expbuf, buf, sizeof(expbuf)) >= sizeof(expbuf)) fatal("rcs_expand_keywords: " |