diff options
| author | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2010-09-29 09:23:55 +0000 |
|---|---|---|
| committer | Tobias Stoeckmann <tobias@cvs.openbsd.org> | 2010-09-29 09:23:55 +0000 |
| commit | db61ceed0b312cc093d0a6fe09d3425f34300db0 (patch) | |
| tree | 0f941b114365dde67b980dbab44bfb03443a31e6 /usr.bin/cvs/rcs.c | |
| parent | 8a0cf1c884726fd6b9c180b8af55d3f5346ae88e (diff) | |
Ensure that we always parse all deltas before expecting "desc" keyword.
ok nicm, zinovik
Diffstat (limited to 'usr.bin/cvs/rcs.c')
| -rw-r--r-- | usr.bin/cvs/rcs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/cvs/rcs.c b/usr.bin/cvs/rcs.c index 84d40641cfe..e136a30e4a1 100644 --- a/usr.bin/cvs/rcs.c +++ b/usr.bin/cvs/rcs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rcs.c,v 1.301 2010/09/11 07:26:00 tobias Exp $ */ +/* $OpenBSD: rcs.c,v 1.302 2010/09/29 09:23:54 tobias Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * All rights reserved. @@ -219,7 +219,7 @@ static int rcs_parse_delta(RCSFILE *); static void rcs_parse_deltas(RCSFILE *, RCSNUM *); static int rcs_parse_deltatext(RCSFILE *); static void rcs_parse_deltatexts(RCSFILE *, RCSNUM *); -static void rcs_parse_desc(RCSFILE *, RCSNUM *); +static void rcs_parse_desc(RCSFILE *); static int rcs_parse_access(RCSFILE *); static int rcs_parse_symbols(RCSFILE *); @@ -1575,7 +1575,7 @@ rcs_parse_deltatexts(RCSFILE *rfp, RCSNUM *rev) return; if (!(rfp->rf_flags & PARSED_DESC)) - rcs_parse_desc(rfp, rev); + rcs_parse_desc(rfp); for (;;) { if (rev != NULL) { rdp = rcs_findrev(rfp, rev); @@ -1599,14 +1599,14 @@ rcs_parse_deltatexts(RCSFILE *rfp, RCSNUM *rev) * Parse RCS description. */ static void -rcs_parse_desc(RCSFILE *rfp, RCSNUM *rev) +rcs_parse_desc(RCSFILE *rfp) { int ret = 0; if ((rfp->rf_flags & PARSED_DESC) || (rfp->rf_flags & RCS_CREATE)) return; if (!(rfp->rf_flags & PARSED_DELTAS)) - rcs_parse_deltas(rfp, rev); + rcs_parse_deltas(rfp, NULL); /* do parsing */ ret = rcs_gettok(rfp); if (ret != RCS_TOK_DESC) |