diff options
| -rw-r--r-- | usr.bin/cvs/diff.c | 8 | ||||
| -rw-r--r-- | usr.bin/cvs/import.c | 5 | ||||
| -rw-r--r-- | usr.bin/cvs/util.c | 8 |
3 files changed, 13 insertions, 8 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 2910f9a7399..ba3774d724c 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.114 2007/01/15 04:21:38 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.115 2007/01/20 01:07:51 niallo Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -192,9 +192,11 @@ cvs_diff_local(struct cvs_file *cf) } if (rev1 != NULL) - diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs); + if ((diff_rev1 = rcs_translate_tag(rev1, cf->file_rcs)) == NULL) + fatal("cvs_diff_local: could not translate tag `%s'", rev1); if (rev2 != NULL) - diff_rev2 = rcs_translate_tag(rev2, cf->file_rcs); + if ((diff_rev2 = rcs_translate_tag(rev2, cf->file_rcs)) == NULL) + fatal("cvs_diff_local: could not translate tag `%s'", rev2); diff_file = cf->file_path; cvs_printf("Index: %s\n%s\nRCS file: %s\n", cf->file_path, diff --git a/usr.bin/cvs/import.c b/usr.bin/cvs/import.c index 8b254462255..d156b4ccb49 100644 --- a/usr.bin/cvs/import.c +++ b/usr.bin/cvs/import.c @@ -1,4 +1,4 @@ -/* $OpenBSD: import.c,v 1.65 2007/01/19 08:21:45 xsa Exp $ */ +/* $OpenBSD: import.c,v 1.66 2007/01/20 01:07:51 niallo Exp $ */ /* * Copyright (c) 2006 Joris Vink <joris@openbsd.org> * @@ -274,7 +274,8 @@ import_update(struct cvs_file *cf) cvs_log(LP_TRACE, "import_update(%s)", cf->file_path); - rev = rcs_translate_tag(import_branch, cf->file_rcs); + if ((rev = rcs_translate_tag(import_branch, cf->file_rcs)) == NULL) + fatal("import_update: could not translate tag `%s'", import_branch); if ((brev = rcsnum_parse(import_branch)) == NULL) fatal("import_update: rcsnum_parse failed"); diff --git a/usr.bin/cvs/util.c b/usr.bin/cvs/util.c index f7e50816c2d..290284110c2 100644 --- a/usr.bin/cvs/util.c +++ b/usr.bin/cvs/util.c @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.99 2007/01/19 23:55:31 todd Exp $ */ +/* $OpenBSD: util.c,v 1.100 2007/01/20 01:07:51 niallo Exp $ */ /* * Copyright (c) 2004 Jean-Francois Brousseau <jfb@openbsd.org> * Copyright (c) 2005, 2006 Joris Vink <joris@openbsd.org> @@ -934,10 +934,12 @@ cvs_revision_select(RCSFILE *file, char *range) if (lstr == NULL) lstr = RCS_HEAD_INIT; - lnum = rcs_translate_tag(lstr, file); + if ((lnum = rcs_translate_tag(lstr, file)) == NULL) + fatal("cvs_revision_select: could not translate tag `%s'", lstr); if (rstr != NULL) { - rnum = rcs_translate_tag(rstr, file); + if ((rnum = rcs_translate_tag(rstr, file)) == NULL) + fatal("cvs_revision_select: could not translate tag `%s'", rstr); } else { rnum = rcsnum_alloc(); rcsnum_cpy(file->rf_head, rnum, 0); |