diff options
| author |   sthen <sthen@openbsd.org> | 2009-04-28 09:05:39 +0000 |
|---|---|---|
| committer | sthen <sthen@openbsd.org> | 2009-04-28 09:05:39 +0000 |
| commit | 6412cad2983db5de72385adb81835d4f4005f38e (patch) | |
| tree | 95258517006720f2619614271b478ac643b6b6af /usr.bin/cvs/diff.c | |
| parent | Add the possibility to go back from merging mode to the previous menu. (diff) | |
| download | wireguard-openbsd-6412cad2983db5de72385adb81835d4f4005f38e.tar.xz wireguard-openbsd-6412cad2983db5de72385adb81835d4f4005f38e.zip | |
support some additional diff options: -a, -b, -d, -w
ok joris@
Diffstat (limited to 'usr.bin/cvs/diff.c')
| -rw-r--r-- | usr.bin/cvs/diff.c | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/usr.bin/cvs/diff.c b/usr.bin/cvs/diff.c index 2fdef195f97..989e272c8b1 100644 --- a/usr.bin/cvs/diff.c +++ b/usr.bin/cvs/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.151 2009/04/03 19:46:56 joris Exp $ */ +/* $OpenBSD: diff.c,v 1.152 2009/04/28 09:05:40 sthen Exp $ */ /* * Copyright (c) 2008 Tobias Stoeckmann <tobias@openbsd.org> * Copyright (c) 2006 Joris Vink <joris@openbsd.org> @@ -46,9 +46,9 @@ struct cvs_cmd cvs_cmd_diff = { CVS_OP_DIFF, CVS_USE_WDIR, "diff", { "di", "dif" }, "Show differences between revisions", - "[-cilNnpRu] [[-D date] [-r rev] [-D date2 | -r rev2]] " + "[-abcdilNnpRuw] [[-D date] [-r rev] [-D date2 | -r rev2]] " "[-k mode] [file ...]", - "cfD:ik:lNnpr:Ru", + "bcfD:ik:lNnpr:Ruw", NULL, cvs_diff }; @@ -78,10 +78,22 @@ cvs_diff(int argc, char **argv) while ((ch = getopt(argc, argv, cvs_cmdop == CVS_OP_DIFF ? cvs_cmd_diff.cmd_opts : cvs_cmd_rdiff.cmd_opts)) != -1) { switch (ch) { + case 'a': + strlcat(diffargs, " -a", sizeof(diffargs)); + diff_aflag = 1; + break; + case 'b': + strlcat(diffargs, " -b", sizeof(diffargs)); + diff_bflag = 1; + break; case 'c': strlcat(diffargs, " -c", sizeof(diffargs)); diff_format = D_CONTEXT; break; + case 'd': + strlcat(diffargs, " -d", sizeof(diffargs)); + diff_dflag = 1; + break; case 'D': if (date1 == -1 && rev1 == NULL) { date1 = cvs_date_parse(optarg); @@ -147,6 +159,10 @@ cvs_diff(int argc, char **argv) case 'V': fatal("the -V option is obsolete " "and should not be used"); + case 'w': + strlcat(diffargs, " -w", sizeof(diffargs)); + diff_wflag = 1; + break; default: fatal("%s", cvs_cmdop == CVS_OP_DIFF ? cvs_cmd_diff.cmd_synopsis : |