===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/file/file.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/file/file.c	2004/12/04 19:55:12	1.16
--- src/usr.bin/file/file.c	2007/02/19 13:02:08	1.17
***************
*** 1,4 ****
! /*	$OpenBSD: file.c,v 1.16 2004/12/04 19:55:12 jaredy Exp $ */
  /*
   * Copyright (c) Ian F. Darwin 1986-1995.
   * Software written by Ian F. Darwin and others;
--- 1,4 ----
! /*	$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,79 ****
  #include "patchlevel.h"
  
  #ifndef	lint
! FILE_RCSID("@(#)$Id: file.c,v 1.16 2004/12/04 19:55:12 jaredy Exp $")
  #endif	/* lint */
  
  
--- 73,79 ----
  #include "patchlevel.h"
  
  #ifndef	lint
! FILE_RCSID("@(#)$Id: file.c,v 1.17 2007/02/19 13:02:08 tom Exp $")
  #endif	/* lint */
  
  
***************
*** 129,135 ****
  	int flags = 0;
  	char *home, *usermagic;
  	struct stat sb;
! #define OPTSTRING	"bcCdf:F:ikLm:nNprsvz"
  #ifdef HAVE_GETOPT_LONG
  	int longindex;
  	private struct option long_options[] =
--- 129,135 ----
  	int flags = 0;
  	char *home, *usermagic;
  	struct stat sb;
! #define OPTSTRING	"bcCdf:F:kLm:nNprsvz"
  #ifdef HAVE_GETOPT_LONG
  	int longindex;
  	private struct option long_options[] =
***************
*** 141,147 ****
  		{"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'},
--- 141,146 ----
***************
*** 225,233 ****
  		case 'F':
  			separator = optarg;
  			break;
- 		case 'i':
- 			flags |= MAGIC_MIME;
- 			break;
  		case 'k':
  			flags |= MAGIC_CONTINUE;
  			break;
--- 224,229 ----
***************
*** 509,515 ****
  "                               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"
--- 505,510 ----