summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorJoris Vink <joris@cvs.openbsd.org>2006-05-29 06:29:50 +0000
committerJoris Vink <joris@cvs.openbsd.org>2006-05-29 06:29:50 +0000
commit1f3282882b69ac263cec040d284972592fa870aa (patch)
treee9e71eb49dc977dd346e9992e2f77bfe55cad707 /usr.bin
parent6ac44ae1f9a5758350f78fe21d2c9686e3fdeef0 (diff)
i forgot to handle directories inside the 'log' code,
which resulted in a very painfull segfault later on. found by reyk@
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/cvs/getlog.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/usr.bin/cvs/getlog.c b/usr.bin/cvs/getlog.c
index 7d9a4563b14..0217a30bcc8 100644
--- a/usr.bin/cvs/getlog.c
+++ b/usr.bin/cvs/getlog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: getlog.c,v 1.58 2006/05/28 21:35:58 joris Exp $ */
+/* $OpenBSD: getlog.c,v 1.59 2006/05/29 06:29:49 joris Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -108,6 +108,12 @@ cvs_log_local(struct cvs_file *cf)
return;
}
+ if (cf->file_type == CVS_DIR) {
+ if (verbosity > 1)
+ cvs_log(LP_NOTICE, "Logging %s", cf->file_path);
+ return;
+ }
+
printf("\nRCS file: %s", cf->file_rpath);
printf("\nWorking file: %s", cf->file_path);
printf("\nhead:");