summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2008-03-09 15:43:56 +0000
committerJoris Vink <joris@cvs.openbsd.org>2008-03-09 15:43:56 +0000
commite2a0dd6530a2aad15ff4cf543fccd453d6972899 (patch)
tree958c1b5773438fc62af1cc09b80a7a7b1cfd9306
parent7ba204208ca3dae54db822d9236f832beeb93dd9 (diff)
locate the first occurance of ':' in the given -j arguments
instead of the last one, otherwise we cannot properly separate the tag from the given date (if any).
-rw-r--r--usr.bin/cvs/update.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/cvs/update.c b/usr.bin/cvs/update.c
index e3ab654a0c0..2d50fdf5c9e 100644
--- a/usr.bin/cvs/update.c
+++ b/usr.bin/cvs/update.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: update.c,v 1.141 2008/03/09 14:28:21 joris Exp $ */
+/* $OpenBSD: update.c,v 1.142 2008/03/09 15:43:55 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -575,7 +575,7 @@ update_join_file(struct cvs_file *cf)
told = cvs_specified_date;
- if ((p = strrchr(jrev2, ':')) != NULL) {
+ if ((p = strchr(jrev2, ':')) != NULL) {
(*p++) = '\0';
cvs_specified_date = cvs_date_parse(p);
}
@@ -584,7 +584,7 @@ update_join_file(struct cvs_file *cf)
cvs_specified_date = told;
if (jrev1 != NULL) {
- if ((p = strrchr(jrev1, ':')) != NULL) {
+ if ((p = strchr(jrev1, ':')) != NULL) {
(*p++) = '\0';
cvs_specified_date = cvs_date_parse(p);
}