diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-06 22:17:22 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-06 22:17:22 +0000 |
| commit | 69ef970c20b54b2b30dab715b21100744a5e62a9 (patch) | |
| tree | f2bf5f78372e7cbd33d673ccca85bd7ed0a8d67c /usr.bin/diff/diff.c | |
| parent | a5f370d9b14b190b154fddc12987b9255cd20e10 (diff) | |
Add -q option from GNU diff
Diffstat (limited to 'usr.bin/diff/diff.c')
| -rw-r--r-- | usr.bin/diff/diff.c | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index eaaf15c629e..afd54bdf271 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.24 2003/07/06 22:02:36 millert Exp $ */ +/* $OpenBSD: diff.c,v 1.25 2003/07/06 22:17:21 millert Exp $ */ /* * Copyright (c) 2003 Todd C. Miller <Todd.Miller@courtesan.com> @@ -21,7 +21,7 @@ */ #ifndef lint -static const char rcsid[] = "$OpenBSD: diff.c,v 1.24 2003/07/06 22:02:36 millert Exp $"; +static const char rcsid[] = "$OpenBSD: diff.c,v 1.25 2003/07/06 22:17:21 millert Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -44,7 +44,7 @@ char *start, *ifdefname, *diffargs; struct stat stb1, stb2; struct excludes *excludes_list; -#define OPTIONS "abC:cD:efhinNPrS:stU:uwX:x:" +#define OPTIONS "abC:cD:efhinNPqrS:stU:uwX:x:" static struct option longopts[] = { { "text", no_argument, 0, 'a' }, { "ignore-space-change", no_argument, 0, 'b' }, @@ -56,6 +56,7 @@ static struct option longopts[] = { { "new-file", no_argument, 0, 'N' }, { "rcs", no_argument, 0, 'n' }, { "unidirectional-new-file", no_argument, 0, 'P' }, + { "brief", no_argument, 0, 'q' }, { "recursive", no_argument, 0, 'r' }, { "report-identical-files", no_argument, 0, 's' }, { "starting-file", required_argument, 0, 'S' }, @@ -128,6 +129,9 @@ main(int argc, char **argv) case 'r': rflag = 1; break; + case 'q': + format = D_BRIEF; + break; case 'S': start = optarg; break; @@ -314,11 +318,11 @@ __dead void usage(void) { (void)fprintf(stderr, - "usage: diff [-bitw] [-c | -e | -f | -n | -u ] file1 file2\n" - " diff [-bitw] -C number file1 file2\n" - " diff [-bitw] -D string file1 file2\n" - " diff [-bitw] -U number file1 file2\n" - " diff [-biNPwt] [-c | -e | -f | -n | -u ] [-r] [-s] [-S name]" + "usage: diff [-biqtw] [-c | -e | -f | -n | -u ] file1 file2\n" + " diff [-biqtw] -C number file1 file2\n" + " diff [-biqtw] -D string file1 file2\n" + " diff [-biqtw] -U number file1 file2\n" + " diff [-biNPqwt] [-c | -e | -f | -n | -u ] [-r] [-s] [-S name]" " [-X file]\n [-x pattern] dir1 dir2\n"); exit(2); |