summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/annotate.c
diff options
context:
space:
mode:
authortobias <tobias@openbsd.org>2008-01-28 20:31:07 +0000
committertobias <tobias@openbsd.org>2008-01-28 20:31:07 +0000
commitbcf224591508a0518ee5a1ff996b0bb628d14275 (patch)
treef7c3e83150a56c2d27b410ab001a8cf3b991c530 /usr.bin/cvs/annotate.c
parentProperly align stack such that code that uses SSE2 instructions doesn't crash. (diff)
downloadwireguard-openbsd-bcf224591508a0518ee5a1ff996b0bb628d14275.tar.xz
wireguard-openbsd-bcf224591508a0518ee5a1ff996b0bb628d14275.zip
Properly handle -R -- although it is default, it may be overwritten mit -l
in front of it. OK joris@, xsa@ > Diff from Igor Zinovik
Diffstat (limited to 'usr.bin/cvs/annotate.c')
-rw-r--r--usr.bin/cvs/annotate.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/usr.bin/cvs/annotate.c b/usr.bin/cvs/annotate.c
index 46782571018..1df9b47fdf1 100644
--- a/usr.bin/cvs/annotate.c
+++ b/usr.bin/cvs/annotate.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: annotate.c,v 1.43 2007/10/09 12:59:53 tobias Exp $ */
+/* $OpenBSD: annotate.c,v 1.44 2008/01/28 20:31:07 tobias Exp $ */
/*
* Copyright (c) 2007 Tobias Stoeckmann <tobias@openbsd.org>
* Copyright (c) 2006 Xavier Santolaria <xsa@openbsd.org>
@@ -63,6 +63,7 @@ cvs_annotate(int argc, char **argv)
flags &= ~CR_RECURSE_DIRS;
break;
case 'R':
+ flags |= CR_RECURSE_DIRS;
break;
case 'r':
cvs_specified_tag = optarg;