Kill diff -h, we don't use or want diffh. Discussed w/ tedu@

5 files changed, 8 insertions, 32 deletions

diff --git a/usr.bin/diff/diff.1 b/usr.bin/diff/diff.1
index c573307a4ca..a2b45be3ff3 100644
--- a/usr.bin/diff/diff.1
+++ b/usr.bin/diff/diff.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: diff.1,v 1.8 2003/06/28 18:33:39 jmc Exp $
+.\" $OpenBSD: diff.1,v 1.9 2003/07/04 17:37:07 millert Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -40,7 +40,7 @@
 .Op Fl abitw
 .Oo
 .Fl c | Fl e | Fl f |
-.Fl h | Fl n | Fl u
+.Fl n | Fl u
 .Oc
 .Ar file1 file2
 .Nm diff
@@ -59,7 +59,7 @@
 .Op Fl abitw
 .Oo
 .Fl c | Fl e | Fl f |
-.Fl h | Fl n | Fl u
+.Fl n | Fl u
 .Oc
 .Op Fl l
 .Op Fl r
@@ -121,11 +121,6 @@ Identical output to that of the
 flag, but in reverse order.
 It cannot be digested by
 .Xr ed 1 .
-.It Fl h
-Invokes an alternate algorithm which can handle files of very long lengths.
-There is a trade off.
-The algorithm can only deal with changes which are clearly delimited and brief.
-Long sections of changes and overlaps will confuse it.
 .It Fl n
 Produces a script similar to that of
 .Fl e ,
@@ -377,13 +372,6 @@ Temporary file used when
 is a device or stdin.
 .It Pa /usr/bin/diff
 For directory diffs.
-.It Pa /usr/bin/diffh
-Alternate algorithm version (used by option
-.Fl h ) .
-.It Pa /usr/bin/pr
-Used by the
-.Fl l
-option.
 .El
 .Sh DIAGNOSTICS
 The
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)
diff --git a/usr.bin/diff/diff.h b/usr.bin/diff/diff.h
index ba259f92438..e4039a4789f 100644
--- a/usr.bin/diff/diff.h
+++ b/usr.bin/diff/diff.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diff.h,v 1.12 2003/07/04 02:54:36 millert Exp $	*/
+/*	$OpenBSD: diff.h,v 1.13 2003/07/04 17:37:07 millert Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -60,7 +60,7 @@
 #define	D_NREVERSE	5	/* Reverse ed script with numbered
 				   lines and no trailing . */
 
-extern int	aflag, bflag, hflag, iflag, lflag, rflag, sflag, tflag, wflag;
+extern int	aflag, bflag, iflag, lflag, rflag, sflag, tflag, wflag;
 extern char	*start, *ifdefname;
 extern int	opt, wantelses, context, status, anychange;
 extern char	*tempfiles[], **diffargv;
diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index 4472ae00aad..c8dbc50c5d5 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diffreg.c,v 1.25 2003/07/04 02:54:36 millert Exp $	*/
+/*	$OpenBSD: diffreg.c,v 1.26 2003/07/04 17:37:07 millert Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -230,11 +230,6 @@ diffreg(void)
 	FILE *f1, *f2;
 	int i, j;
 
-	if (hflag) {
-		diffargv[0] = "diffh";
-		execv(_PATH_DIFFH, diffargv);
-		error("%s", _PATH_DIFFH);
-	}
 	chrtran = (iflag ? cup2low : clow2low);
 	if (strcmp(file1, "-") == 0 && strcmp(file2, "-") == 0)
 		errorx("can't specify - -");
diff --git a/usr.bin/diff/pathnames.h b/usr.bin/diff/pathnames.h
index 3d9650984e0..403228048f8 100644
--- a/usr.bin/diff/pathnames.h
+++ b/usr.bin/diff/pathnames.h
@@ -32,5 +32,4 @@
 #include <paths.h>
 
 #define	_PATH_DIFF	"/usr/bin/diff"
-#define	_PATH_DIFFH	"/usr/libexec/diffh"
 #define	_PATH_PR	"/usr/bin/pr"