diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-04 17:37:08 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2003-07-04 17:37:08 +0000 |
| commit | d33e124248685a079ceb722d29cc4dc58b1071df (patch) | |
| tree | 0d9150c556f4f7df6d5e7e95c51d1ca3a959383e /usr.bin/diff/diff.c | |
| parent | 87bbf14c204eb3b134942571607a26e3254590df (diff) | |
Kill diff -h, we don't use or want diffh. Discussed w/ tedu@
Diffstat (limited to 'usr.bin/diff/diff.c')
| -rw-r--r-- | usr.bin/diff/diff.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/usr.bin/diff/diff.c b/usr.bin/diff/diff.c index 1c5998fab0c..72dbcd78d85 100644 --- a/usr.bin/diff/diff.c +++ b/usr.bin/diff/diff.c @@ -1,4 +1,4 @@ -/* $OpenBSD: diff.c,v 1.19 2003/07/04 02:54:36 millert Exp $ */ +/* $OpenBSD: diff.c,v 1.20 2003/07/04 17:37:07 millert Exp $ */ /* * Copyright (C) Caldera International Inc. 2001-2002. @@ -54,7 +54,6 @@ int opt; int aflag; /* treat all files as text */ int tflag; /* expand tabs on output */ /* Algorithm related options. */ -int hflag; /* -h, use halfhearted DIFFH */ int bflag; /* ignore blanks in comparisons */ int wflag; /* totally ignore blanks in comparisons */ int iflag; /* ignore case in comparisons */ @@ -92,7 +91,7 @@ main(int argc, char **argv) status = 2; diffargv = argv; - while ((ch = getopt(argc, argv, "abC:cD:efhilnrS:stU:uw")) != -1) { + while ((ch = getopt(argc, argv, "abC:cD:efilnrS:stU:uw")) != -1) { switch (ch) { case 'a': aflag++; @@ -120,9 +119,6 @@ main(int argc, char **argv) case 'f': opt = D_REVERSE; break; - case 'h': - hflag++; - break; case 'i': iflag++; break; @@ -169,8 +165,6 @@ main(int argc, char **argv) errorx("two filename arguments required"); file1 = argv[0]; file2 = argv[1]; - if (hflag && opt) - errorx("-h doesn't support -D, -c, -C, -e, -f, -I, -n, -u or -U"); if (!strcmp(file1, "-")) stb1.st_mode = S_IFREG; else if (stat(file1, &stb1) < 0) |