summaryrefslogtreecommitdiffstats
path: root/usr.bin/cvs/diff.c
diff options
context:
space:
mode:
authortobias <tobias@openbsd.org>2008-02-04 21:25:32 +0000
committertobias <tobias@openbsd.org>2008-02-04 21:25:32 +0000
commite9d834581e0d3c7f8bad6be8ff6d31ec76aa2c02 (patch)
treeda31f8fac3575a444a668ca4fe08b3553f359fee /usr.bin/cvs/diff.c
parentadd IPv6 addresses for the root servers. (diff)
downloadwireguard-openbsd-e9d834581e0d3c7f8bad6be8ff6d31ec76aa2c02.tar.xz
wireguard-openbsd-e9d834581e0d3c7f8bad6be8ff6d31ec76aa2c02.zip
r* commands have their own usage; don't check usage of their working dir
equivalents. OK joris@, xsa@
Diffstat (limited to 'usr.bin/cvs/diff.c')
-rw-r--r--usr.bin/cvs/diff.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c
index 97bb3066192..bc476e14066 100644
--- a/usr.bin/cvs/diff.c
+++ b/usr.bin/cvs/diff.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: diff.c,v 1.126 2008/02/04 15:07:33 tobias Exp $ */
+/* $OpenBSD: diff.c,v 1.127 2008/02/04 21:25:32 tobias Exp $ */
/*
* Copyright (c) 2006 Joris Vink <joris@openbsd.org>
*
@@ -60,15 +60,15 @@ struct cvs_cmd cvs_cmd_rdiff = {
int
cvs_diff(int argc, char **argv)
{
- int ch;
+ int ch, flags;
char *arg = ".";
- int flags;
struct cvs_recursion cr;
flags = CR_RECURSE_DIRS;
strlcpy(diffargs, argv[0], sizeof(diffargs));
- while ((ch = getopt(argc, argv, cvs_cmd_diff.cmd_opts)) != -1) {
+ while ((ch = getopt(argc, argv, cvs_cmdop == CVS_OP_DIFF ?
+ cvs_cmd_diff.cmd_opts : cvs_cmd_rdiff.cmd_opts)) != -1) {
switch (ch) {
case 'c':
strlcat(diffargs, " -c", sizeof(diffargs));