more fixes from Igor Sobrado

diff --git a/doc/file.man b/doc/file.man
index 625d418015f71e5e2a3ec3981bdd1ea58b062691..d1a5bb16027eafb4f1e7592498f70999db9dfe9d 100644 (file)
--- a/doc/file.man
+++ b/doc/file.man
@@ -1,4 +1,4 @@
-.\" $File: file.man,v 1.80 2009/05/08 17:41:58 christos Exp $
+.\" $File: file.man,v 1.81 2009/11/04 17:27:37 christos Exp $
 .Dd October 9, 2008
 .Dt FILE __CSECTION__
 .Os
@@ -8,9 +8,11 @@
 .Sh SYNOPSIS
 .Nm
 .Bk -words
-.Op Fl bchikLNnprsvz
+.Op Fl bchikLNnprsvz0
+.Op Fl -apple
 .Op Fl -mime-encoding
 .Op Fl -mime-type
+.Op Fl e Ar testname
 .Op Fl F Ar separator
 .Op Fl f Ar namefile
 .Op Fl m Ar magicfiles

diff --git a/src/file.c b/src/file.c
index 2d08fae8f034d5e378049e685a8b9e208fce991e..07a80701f597336be72b0312d8f9886ecd4334b4 100644 (file)
--- a/src/file.c
+++ b/src/file.c
@@ -32,7 +32,7 @@
 #include "file.h"
 
 #ifndef        lint
-FILE_RCSID("@(#)$File: file.c,v 1.133 2009/09/14 17:50:38 christos Exp $")
+FILE_RCSID("@(#)$File: file.c,v 1.134 2009/11/04 17:27:37 christos Exp $")
 #endif /* lint */
 
 #include "magic.h"
@@ -73,15 +73,16 @@ int getopt_long(int argc, char * const *argv, const char *optstring, const struc
 #include "patchlevel.h"
 
 #ifdef S_IFLNK
-#define FILE_FLAGS "-bchikLNnrsvz0"
+#define FILE_FLAGS "-bchikLNnprsvz0"
 #else
-#define FILE_FLAGS "-bcikNnrsvz0"
+#define FILE_FLAGS "-bcikNnprsvz0"
 #endif
 
 # define USAGE  
     "Usage: %s [" FILE_FLAGS \
-       "] [-e test] [-f namefile] [-F separator] [-m magicfiles] file...\n" \
-    "       %s -C -m magicfiles\n" \
+       "] [--apple] [--mime-encoding] [--mime-type]\n" \
+    "            [-e testname] [-F separator] [-f namefile] [-m magicfiles] file ...\n" \
+    "       %s -C [-m magicfiles]\n" \
     "       %s [--help]\n"
 
 #ifndef MAXPATHLEN