change comma-separated, to slash-separated

diff --git a/doc/file.man b/doc/file.man
index ccf97946e77fc7c9ab9893aa92dd4d2de2888bef..496d523b35097d09ddca82ee30367637dfbf3fc8 100644 (file)
--- a/doc/file.man
+++ b/doc/file.man
@@ -1,4 +1,4 @@
-.\" $File: file.man,v 1.112 2015/02/14 17:24:30 christos Exp $
+.\" $File: file.man,v 1.113 2015/04/09 20:01:40 christos Exp $
 .Dd April 9, 2015
 .Dt FILE __CSECTION__
 .Os
@@ -215,7 +215,7 @@ Consults magic files.
 Examines tar files.
 .El
 .It Fl Fl extension 
-Print a comma-separated list of valid extensions for the file type found.
+Print a slash-separated list of valid extensions for the file type found.
 .It Fl F , Fl Fl separator Ar separator
 Use the specified string as the separator between the filename and the
 file result returned.

diff --git a/doc/libmagic.man b/doc/libmagic.man
index 026edf923576bd35933fa5dac9215ac17d9584d6..eccb1a9774e38080f3aadd087affdb224d478aeb 100644 (file)
--- a/doc/libmagic.man
+++ b/doc/libmagic.man
@@ -1,4 +1,4 @@
-.\" $File: libmagic.man,v 1.34 2014/12/16 23:18:40 christos Exp $
+.\" $File: libmagic.man,v 1.35 2015/04/09 20:01:40 christos Exp $
 .\"
 .\" Copyright (c) Christos Zoulas 2003.
 .\" All Rights Reserved.
@@ -133,7 +133,7 @@ as real errors, instead of printing them in the magic buffer.
 .It Dv MAGIC_APPLE
 Return the Apple creator and type.
 .It Dv MAGIC_EXTENSION
-Return a comma-separated list of extensions for this file type.
+Return a slash-separated list of extensions for this file type.
 .It Dv MAGIC_NO_CHECK_APPTYPE
 Don't check for
 .Dv EMX

diff --git a/magic/Magdir/jpeg b/magic/Magdir/jpeg
index eb84099b2de86f885743d5fc5b1dbc385a0eb5ab..e6a4ffa0f04b5587508ee756fe8cefd9183fa30d 100644 (file)
--- a/magic/Magdir/jpeg
+++ b/magic/Magdir/jpeg
@@ -1,6 +1,6 @@
 
 #------------------------------------------------------------------------------
-# $File: jpeg,v 1.27 2015/02/06 17:08:31 christos Exp $
+# $File: jpeg,v 1.28 2015/04/09 20:01:40 christos Exp $
 # JPEG images
 # SunOS 5.5.1 had
 #
@@ -13,7 +13,7 @@
 !:mime image/jpeg
 !:apple        8BIMJPEG
 !:strength *3
-!:ext jpeg,jpg,jpe,jfif
+!:ext jpeg/jpg/jpe/jfif
 >6     string          JFIF            \b, JFIF standard
 # The following added by Erik Rossen <rossen@freesurf.ch> 1999-09-06
 # in a vain attempt to add image size reporting for JFIF.  Note that these

diff --git a/src/file_opts.h b/src/file_opts.h
index 79ced3a4018d43a50c8e148f4937702737d6af80..317cb328ba9d0a59ead9308d00c95ca71ff38fc8 100644 (file)
--- a/src/file_opts.h
+++ b/src/file_opts.h
@@ -29,7 +29,7 @@ OPT('F', "separator", 1, " STRING     use string as separator instead of `:'\n")
 OPT('i', "mime", 0, "                 output MIME type strings (--mime-type and\n"
     "                               --mime-encoding)\n")
 OPT_LONGONLY("apple", 0, "                output the Apple CREATOR/TYPE\n")
-OPT_LONGONLY("extension", 0, "            output a comma-separated list of extnsions\n")
+OPT_LONGONLY("extension", 0, "            output a slash-separated list of extnsions\n")
 OPT_LONGONLY("mime-type", 0, "            output the MIME type\n")
 OPT_LONGONLY("mime-encoding", 0, "        output the MIME encoding\n")
 OPT('k', "keep-going", 0, "           don't stop at the first match\n")

diff --git a/src/magic.h.in b/src/magic.h.in
index 91997be986a158afd9264c8c7555eb3f6fe6031c..3e7b10e0937a9fe923245c1166acc75ce124245a 100644 (file)
--- a/src/magic.h.in
+++ b/src/magic.h.in
@@ -43,7 +43,8 @@
 #define        MAGIC_MIME_ENCODING     0x0000400 /* Return the MIME encoding */
 #define MAGIC_MIME             (MAGIC_MIME_TYPE|MAGIC_MIME_ENCODING)
 #define        MAGIC_APPLE             0x0000800 /* Return the Apple creator/type */
-#define        MAGIC_EXTENSION         0x1000000 /* Return the Apple creator/type */
+#define        MAGIC_EXTENSION         0x1000000 /* Return a /-separated list of
+                                          * extensions  */
 
 #define        MAGIC_NO_CHECK_COMPRESS 0x0001000 /* Don't check for compressed files */
 #define        MAGIC_NO_CHECK_TAR      0x0002000 /* Don't check for tar files */