add -b and -bb option... I need to re-think this because it breaks compatibility

1 files changed, 10 insertions, 3 deletions

diff --git a/src/file_opts.h b/src/file_opts.h
index f46cf99b..7f377a41 100644
--- a/src/file_opts.h
+++ b/src/file_opts.h
@@ -1,5 +1,3 @@
-/* $File$ */
-
 /*
  * Table of command-line options
  *
@@ -10,6 +8,8 @@
  *
  * N.B. The long options' order must correspond to the code in file.c,
  * and OPTSTRING must be kept up-to-date with the short options.
+ * Pay particular attention to the numbers of long-only options in the
+ * switch statement!
  */
 
 OPT_LONGONLY("help", 0, "                 display this help and exit\n")
@@ -17,7 +17,14 @@ OPT('v', "version", 0, "              output version information and exit\n")
 OPT('m', "magic-file", 1, " LIST      use LIST as a colon-separated list of magic\n"
     "                               number files\n")
 OPT('z', "uncompress", 0, "           try to look inside compressed files\n")
-OPT('b', "brief", 0, "                do not prepend filenames to output lines\n")
+OPT('b', "brief", 0, "                do not prepend filenames to output lines\n"
+    "                               If this flag is specified once, then\n"
+    "                               the filename is printed if more than one\n"
+    "                               files are tested.  If this flag is specified\n"
+    "                               more than once, then filenames are never printed\n")
+OPT_LONGONLY("no-filename", 0, "          synonym for --brief\n")
+OPT_LONGONLY("with-filename", 0, "        print the file name for each match.  This is\n"
+    "                               the default.\n")
 OPT('c', "checking-printout", 0, "    print the parsed form of the magic file, use in\n"
     "                               conjunction with -m to debug a new magic file\n"
     "                               before installing it\n")