summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorray <ray@openbsd.org>2007-05-26 02:30:28 +0000
committerray <ray@openbsd.org>2007-05-26 02:30:28 +0000
commit338f769c69cd7d1dfed7618d152306aec0f4017c (patch)
tree65d630d684c0244b64c0cb5fc101efb311767d0e
parentcleanup (diff)
downloadwireguard-openbsd-338f769c69cd7d1dfed7618d152306aec0f4017c.tar.xz
wireguard-openbsd-338f769c69cd7d1dfed7618d152306aec0f4017c.zip
Treat lines that start with "dummy timestamp from new-entry" as a
dummy timestamp, not just lines that match it exactly. OK xsa@.
-rw-r--r--usr.bin/cvs/entries.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/cvs/entries.c b/usr.bin/cvs/entries.c
index 8019f04ee94..882a2ea36d0 100644
--- a/usr.bin/cvs/entries.c
+++ b/usr.bin/cvs/entries.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: entries.c,v 1.76 2007/05/16 20:51:22 xsa Exp $ */
+/* $OpenBSD: entries.c,v 1.77 2007/05/26 02:30:28 ray Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -152,7 +152,7 @@ cvs_ent_parse(const char *entry)
fatal("failed to parse entry revision '%s'", entry);
if (fields[3][0] == '\0' ||
- strcmp(fields[3], CVS_DATE_DUMMY) == 0 ||
+ strncmp(fields[3], CVS_DATE_DUMMY, sizeof(CVS_DATE_DUMMY) - 1) == 0 ||
strncmp(fields[3], "Initial ", 8) == 0 ||
strncmp(fields[3], "Result of merge", 15) == 0)
ent->ce_mtime = CVS_DATE_DMSEC;