Our version of file(1) doesn't have the MIME magic file, so remove

references to -i/--mime and no longer accept them on the command line.
Update the HISTORY section to be less confusing.

Based on a diff to tech@ by Mikolaj Kucharski, mikolaj (dot) kucharski
(at) gmail (dot) com.

Prompted by jmc@; input from and ok jmc@ and otto@

2 files changed, 7 insertions, 13 deletions

diff --git a/usr.bin/file/file.1 b/usr.bin/file/file.1
index 054801a5f27..371efc002ed 100644
--- a/usr.bin/file/file.1
+++ b/usr.bin/file/file.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: file.1,v 1.23 2004/12/04 19:55:12 jaredy Exp $
+.\" $OpenBSD: file.1,v 1.24 2007/02/19 13:02:08 tom Exp $
 .\" $FreeBSD: src/usr.bin/file/file.1,v 1.16 2000/03/01 12:19:39 sheldonh Exp $
 .\"
 .\" Copyright (c) Ian F. Darwin 1986-1995.
@@ -345,10 +345,9 @@ Primary development and maintenence from 1990 to the present by
 .Pp
 Altered by
 .An Chris Lowth Aq chris@lowth.com ,
-2000: Handle the
-.Fl i
-option to output mime type strings and using an alternative magic file
-and internal logic.
+2000, to optionally report MIME types.
+This required an alternative magic file, and is not available in
+.Ox .
 .Pp
 Altered by
 .An Eric Fischer Aq enf@pobox.com ,
diff --git a/usr.bin/file/file.c b/usr.bin/file/file.c
index c02e3aecfbb..cd1169b3ea0 100644
--- a/usr.bin/file/file.c
+++ b/usr.bin/file/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.16 2004/12/04 19:55:12 jaredy Exp $ */
+/*	$OpenBSD: file.c,v 1.17 2007/02/19 13:02:08 tom Exp $ */
 /*
  * Copyright (c) Ian F. Darwin 1986-1995.
  * Software written by Ian F. Darwin and others;
@@ -73,7 +73,7 @@
 #include "patchlevel.h"
 
 #ifndef	lint
-FILE_RCSID("@(#)$Id: file.c,v 1.16 2004/12/04 19:55:12 jaredy Exp $")
+FILE_RCSID("@(#)$Id: file.c,v 1.17 2007/02/19 13:02:08 tom Exp $")
 #endif	/* lint */
 
 
@@ -129,7 +129,7 @@ main(int argc, char *argv[])
 	int flags = 0;
 	char *home, *usermagic;
 	struct stat sb;
-#define OPTSTRING	"bcCdf:F:ikLm:nNprsvz"
+#define OPTSTRING	"bcCdf:F:kLm:nNprsvz"
 #ifdef HAVE_GETOPT_LONG
 	int longindex;
 	private struct option long_options[] =
@@ -141,7 +141,6 @@ main(int argc, char *argv[])
 		{"debug", 0, 0, 'd'},
 		{"files-from", 1, 0, 'f'},
 		{"separator", 1, 0, 'F'},
-		{"mime", 0, 0, 'i'},
 		{"keep-going", 0, 0, 'k'},
 #ifdef S_IFLNK
 		{"dereference", 0, 0, 'L'},
@@ -225,9 +224,6 @@ main(int argc, char *argv[])
 		case 'F':
 			separator = optarg;
 			break;
-		case 'i':
-			flags |= MAGIC_MIME;
-			break;
 		case 'k':
 			flags |= MAGIC_CONTINUE;
 			break;
@@ -509,7 +505,6 @@ help(void)
 "                               before installing it\n"
 "  -f, --files-from FILE      read the filenames to be examined from FILE\n"
 "  -F, --separator string     use string as separator instead of `:'\n"
-"  -i, --mime                 output mime type strings\n"
 "  -k, --keep-going           don't stop at the first match\n"
 "  -L, --dereference          causes symlinks to be followed\n"
 "  -n, --no-buffer            do not buffer output\n"