Browse Source

Import upstream version 5.04

Christos Zoulas 9 years ago
parent
commit
4027497753
100 changed files with 588 additions and 166 deletions
  1. 78 0
      ChangeLog
  2. 15 15
      configure
  3. 5 5
      configure.ac
  4. 22 18
      doc/file.man
  5. 8 8
      doc/libmagic.man
  6. 5 5
      doc/magic.man
  7. 2 0
      magic/Magdir/acorn
  8. 1 0
      magic/Magdir/adi
  9. 1 0
      magic/Magdir/adventure
  10. 2 0
      magic/Magdir/allegro
  11. 1 0
      magic/Magdir/alliant
  12. 2 0
      magic/Magdir/alpha
  13. 2 0
      magic/Magdir/amanda
  14. 2 0
      magic/Magdir/amigaos
  15. 16 10
      magic/Magdir/animation
  16. 1 0
      magic/Magdir/apl
  17. 2 0
      magic/Magdir/apple
  18. 1 0
      magic/Magdir/applix
  19. 80 53
      magic/Magdir/archive
  20. 1 0
      magic/Magdir/asterix
  21. 1 0
      magic/Magdir/att3b
  22. 4 2
      magic/Magdir/audio
  23. 2 0
      magic/Magdir/basis
  24. 2 0
      magic/Magdir/bflt
  25. 2 0
      magic/Magdir/blender
  26. 1 0
      magic/Magdir/blit
  27. 3 1
      magic/Magdir/bout
  28. 2 0
      magic/Magdir/bsdi
  29. 2 0
      magic/Magdir/btsnoop
  30. 2 0
      magic/Magdir/c-lang
  31. 2 0
      magic/Magdir/c64
  32. 1 0
      magic/Magdir/cad
  33. 2 0
      magic/Magdir/cafebabe
  34. 3 1
      magic/Magdir/cddb
  35. 1 0
      magic/Magdir/chord
  36. 2 0
      magic/Magdir/cisco
  37. 2 0
      magic/Magdir/citrus
  38. 1 0
      magic/Magdir/clarion
  39. 1 0
      magic/Magdir/claris
  40. 1 0
      magic/Magdir/clipper
  41. 26 25
      magic/Magdir/commands
  42. 1 0
      magic/Magdir/communications
  43. 1 0
      magic/Magdir/compress
  44. 2 0
      magic/Magdir/console
  45. 2 0
      magic/Magdir/convex
  46. 1 0
      magic/Magdir/cracklib
  47. 2 0
      magic/Magdir/ctags
  48. 1 0
      magic/Magdir/dact
  49. 1 0
      magic/Magdir/database
  50. 1 0
      magic/Magdir/diamond
  51. 5 0
      magic/Magdir/diff
  52. 3 0
      magic/Magdir/digital
  53. 3 0
      magic/Magdir/dolby
  54. 1 0
      magic/Magdir/dump
  55. 1 0
      magic/Magdir/dyadic
  56. 1 0
      magic/Magdir/editors
  57. 1 0
      magic/Magdir/efi
  58. 1 0
      magic/Magdir/elf
  59. 1 0
      magic/Magdir/encore
  60. 48 6
      magic/Magdir/epoc
  61. 1 0
      magic/Magdir/erlang
  62. 1 0
      magic/Magdir/esri
  63. 1 0
      magic/Magdir/fcs
  64. 111 13
      magic/Magdir/filesystems
  65. 4 0
      magic/Magdir/flash
  66. 9 1
      magic/Magdir/fonts
  67. 3 0
      magic/Magdir/fortran
  68. 2 0
      magic/Magdir/frame
  69. 1 0
      magic/Magdir/freebsd
  70. 1 0
      magic/Magdir/fsav
  71. 2 0
      magic/Magdir/games
  72. 1 0
      magic/Magdir/gcc
  73. 1 0
      magic/Magdir/geos
  74. 2 0
      magic/Magdir/gimp
  75. 3 0
      magic/Magdir/gnome-keyring
  76. 2 0
      magic/Magdir/gnu
  77. 1 0
      magic/Magdir/gnumeric
  78. 1 0
      magic/Magdir/grace
  79. 2 0
      magic/Magdir/graphviz
  80. 1 0
      magic/Magdir/gringotts
  81. 1 0
      magic/Magdir/hitachi-sh
  82. 2 0
      magic/Magdir/hp
  83. 1 0
      magic/Magdir/human68k
  84. 1 0
      magic/Magdir/ibm370
  85. 1 0
      magic/Magdir/ibm6000
  86. 1 0
      magic/Magdir/iff
  87. 27 2
      magic/Magdir/images
  88. 2 1
      magic/Magdir/inform
  89. 1 0
      magic/Magdir/intel
  90. 1 0
      magic/Magdir/interleaf
  91. 1 0
      magic/Magdir/island
  92. 1 0
      magic/Magdir/ispell
  93. 2 0
      magic/Magdir/java
  94. 1 0
      magic/Magdir/jpeg
  95. 1 0
      magic/Magdir/karma
  96. 1 0
      magic/Magdir/kde
  97. 2 0
      magic/Magdir/kml
  98. 2 0
      magic/Magdir/lecter
  99. 2 0
      magic/Magdir/lex
  100. 0 0
      magic/Magdir/lif

+ 78 - 0
ChangeLog

@@ -1,3 +1,81 @@
+2010-01-22  15:45  Christos Zoulas <christos@zoulas.com>
+
+	* print proper mime for crystal reports file
+
+	* print the last summary information of a cdf document, not the
+	  first so that nested documents print the right info
+
+2010-01-16  18:42  Charles Longeau <chl@tuxfamily.org>
+
+	* bring back some fixes from OpenBSD:
+		- make gcc2 builds file
+		- fix typos in a magic file comment
+
+2009-11-17  18:35  Christos Zoulas <christos@zoulas.com>
+
+	* ctime/asctime can return NULL on some OS's although
+	  they should not (Toshit Antani)
+
+2009-09-14  13:49  Christos Zoulas <christos@zoulas.com>
+
+	* Centralize magic path handling routines and remove the
+	  special-casing from file.c so that the python module for
+	  example comes up with the same magic path (Fixes ~/.magic
+	  handling) (from Gab)
+
+2009-09-11  23:38  Reuben Thomas <rrt@sc3d.org>
+
+	* When magic argument is a directory, read the files in
+	  strcmp-sorted order (fixes Debian bug #488562 and our own FIXME).
+
+2009-09-11  13:11  Reuben Thomas <rrt@sc3d.org>
+
+	* Combine overlapping epoc and psion magic files into one (epoc).
+
+	* Add some more EPOC MIME types.
+
+2009-08-19  15:55  Christos Zoulas <christos@zoulas.com>
+
+	* Fix 3 bugs (From Ian Darwin):
+	    - file_showstr could move one past the end of the array
+	    - parse_apple did not nul terminate the string in the overflow case
+	    - parse_mime truncated the wrong string in the overflow case
+
+2009-08-12  12:28  Robert Byrnes  <byrnes@wildpumpkin.net>
+
+	* Include Localstuff when compiling magic.
+
+2009-07-15  10:05  Christos Zoulas <christos@zoulas.com>
+
+	* Fix logic for including mygetopts.h
+
+	* Make cdf.c compile again with debugging
+
+	* Add the necessary field handling for crystal reports files to work
+
+2009-06-23 01:34  Reuben Thomas <rrt@sc3d.org>
+
+	* Stop "(if" identifying Lisp files, that's plain dumb!
+
+2009-06-09 22:13  Reuben Thomas <rrt@sc3d.org>
+
+	* Add a couple of missing MP3 MIME types.
+
+2009-05-27 23:00  Reuben Thomas <rrt@sc3d.org>
+
+	* Add full range of hash-bang tests for Python and Ruby.
+
+	* Add MIME types for Python and Ruby scripts.
+
+2009-05-13  10:44  Christos Zoulas <christos@zoulas.com>
+
+	* off by one in parsing hw capabilities in elf
+	  (Cheng Renquan)
+
+2009-05-08  13:40  Christos Zoulas <christos@zoulas.com>
+	
+	* lint fixes and more from NetBSD
+
 2009-05-06  10:25  Christos Zoulas <christos@zoulas.com>
 
 	* Avoid null dereference in cdf code (Drew Yao)

+ 15 - 15
configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for file 5.03.
+# Generated by GNU Autoconf 2.61 for file 5.04.
 #
 # Report bugs to <christos@astron.com>.
 #
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='file'
 PACKAGE_TARNAME='file'
-PACKAGE_VERSION='5.03'
-PACKAGE_STRING='file 5.03'
+PACKAGE_VERSION='5.04'
+PACKAGE_STRING='file 5.04'
 PACKAGE_BUGREPORT='christos@astron.com'
 
 # Factoring default headers for most tests.
@@ -1399,7 +1399,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures file 5.03 to adapt to many kinds of systems.
+\`configure' configures file 5.04 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1469,7 +1469,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of file 5.03:";;
+     short | recursive ) echo "Configuration of file 5.04:";;
    esac
   cat <<\_ACEOF
 
@@ -1576,7 +1576,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-file configure 5.03
+file configure 5.04
 generated by GNU Autoconf 2.61
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1590,7 +1590,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by file $as_me 5.03, which was
+It was created by file $as_me 5.04, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   $ $0 $@
@@ -2280,7 +2280,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='file'
- VERSION='5.03'
+ VERSION='5.04'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23563,17 +23563,17 @@ echo "${ECHO_T}yes" >&6; }
 fi
 else
 
-if test "$GCC" = no; then
-   WARNINGS=
-   { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-else
+if test "$GCC" = yes; then
    { echo "$as_me:$LINENO: result: yes" >&5
 echo "${ECHO_T}yes" >&6; }
    WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
        -Wmissing-declarations -Wredundant-decls -Wnested-externs \
        -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
        -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
+else
+   WARNINGS=
+   { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
 fi
 fi
 
@@ -24303,7 +24303,7 @@ exec 6>&1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by file $as_me 5.03, which was
+This file was extended by file $as_me 5.04, which was
 generated by GNU Autoconf 2.61.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -24356,7 +24356,7 @@ Report bugs to <bug-autoconf@gnu.org>."
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-file config.status 5.03
+file config.status 5.04
 configured by $0, generated by GNU Autoconf 2.61,
   with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
 

+ 5 - 5
configure.ac

@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT(file, 5.03, christos@astron.com)
+AC_INIT(file, 5.04, christos@astron.com)
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 #AC_CONFIG_MACRO_DIR([m4])
@@ -130,15 +130,15 @@ else
        -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
        -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
 fi], [
-if test "$GCC" = no; then
-   WARNINGS=
-   AC_MSG_RESULT(no)
-else
+if test "$GCC" = yes; then
    AC_MSG_RESULT(yes)
    WARNINGS="-Wall -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith \
        -Wmissing-declarations -Wredundant-decls -Wnested-externs \
        -Wsign-compare -Wreturn-type -Wswitch -Wshadow \
        -Wcast-qual -Wwrite-strings -Wextra -Wunused-parameter"
+else
+   WARNINGS=
+   AC_MSG_RESULT(no)
 fi])
 
 dnl Checks for functions

+ 22 - 18
doc/file.man

@@ -1,4 +1,4 @@
-.\" $File: file.man,v 1.79 2008/11/06 22:49:08 rrt Exp $
+.\" $File: file.man,v 1.82 2009/11/04 22:30:34 christos Exp $
 .Dd October 9, 2008
 .Dt FILE __CSECTION__
 .Os
@@ -7,16 +7,20 @@
 .Nd determine file type
 .Sh SYNOPSIS
 .Nm
-.Op Fl bchikLnNprsvz
-.Op Fl -mime-type
+.Bk -words
+.Op Fl bchikLNnprsvz0
+.Op Fl -apple
 .Op Fl -mime-encoding
-.Op Fl f Ar namefile
+.Op Fl -mime-type
+.Op Fl e Ar testname
 .Op Fl F Ar separator
+.Op Fl f Ar namefile
 .Op Fl m Ar magicfiles
-.Ar file
+.Ar
+.Ek -words
 .Nm
 .Fl C
-.Op Fl m Ar magicfile
+.Op Fl m Ar magicfiles
 .Nm
 .Op Fl -help
 .Sh DESCRIPTION
@@ -161,21 +165,21 @@ in any of the character sets listed above is simply said to be
 .Bl -tag -width indent
 .It Fl b , -brief
 Do not prepend filenames to output lines (brief mode).
+.It Fl C , -compile
+Write a
+.Pa magic.mgc
+output file that contains a pre-parsed version of the magic file or directory.
 .It Fl c , -checking-printout
 Cause a checking printout of the parsed form of the magic file.
 This is usually used in conjunction with the
 .Fl m
 flag to debug a new magic file before installing it.
-.It Fl C , -compile
-Write a
-.Pa magic.mgc
-output file that contains a pre-parsed version of the magic file or directory.
 .It Fl e , -exclude Ar testname
 Exclude the test named in
 .Ar testname
 from the list of tests made to determine the file type. Valid test names
 are:
-.Bl -tag -width
+.Bl -tag -width compress
 .It apptype
 .Dv EMX
 application type (only on EMX).
@@ -198,6 +202,10 @@ Consults magic files.
 .It tar
 Examines tar files.
 .El
+.It Fl F , -separator Ar separator
+Use the specified string as the separator between the filename and the
+file result returned. Defaults to
+.Sq \&: .
 .It Fl f , -files-from Ar namefile
 Read the names of the files to be examined from
 .Ar namefile
@@ -209,10 +217,6 @@ or at least one filename argument must be present;
 to test the standard input, use
 .Sq -
 as a filename argument.
-.It Fl F , -separator Ar separator
-Use the specified string as the separator between the filename and the
-file result returned. Defaults to
-.Sq \&: .
 .It Fl h , -no-dereference
 option causes symlinks not to be followed
 (on systems that support symbolic links). This is the default if the
@@ -250,16 +254,16 @@ option causes symlinks to be followed, as the like-named option in
 This is the default if the environment variable
 .Dv POSIXLY_CORRECT
 is defined.
-.It Fl m , -magic-file Ar list
+.It Fl m , -magic-file Ar magicfiles
 Specify an alternate list of files and directories containing magic.
 This can be a single item, or a colon-separated list.
 If a compiled magic file is found alongside a file or directory, it will be used instead.
+.It Fl N , -no-pad
+Don't pad filenames so that they align in the output.
 .It Fl n , -no-buffer
 Force stdout to be flushed after checking each file.
 This is only useful if checking a list of files.
 It is intended to be used by programs that want filetype output from a pipe.
-.It Fl N , -no-pad
-Don't pad filenames so that they align in the output.
 .It Fl p , -preserve-date
 On systems that support
 .Xr utime 2

+ 8 - 8
doc/libmagic.man

@@ -1,4 +1,4 @@
-.\" $File: libmagic.man,v 1.19 2008/10/06 20:16:04 christos Exp $
+.\" $File: libmagic.man,v 1.21 2009/11/24 21:16:14 christos Exp $
 .\"
 .\" Copyright (c) Christos Zoulas 2003.
 .\" All Rights Reserved.
@@ -12,7 +12,7 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 
+.\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
 .\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 .\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
@@ -25,8 +25,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd October 6, 2008
-.Dt MAGIC 3
+.Dd November 24, 2009
+.Dt LIBMAGIC 3
 .Os
 .Sh NAME
 .Nm magic_open ,
@@ -73,7 +73,7 @@ in
 The function
 .Fn magic_open
 creates a magic cookie pointer and returns it. It returns NULL if
-there was an error allocating the magic cookie. The 
+there was an error allocating the magic cookie. The
 .Ar flags
 argument specifies how the other magic functions should behave:
 .Bl -tag -width MAGIC_COMPRESS
@@ -165,7 +165,7 @@ bytes size.
 .Pp
 The
 .Fn magic_setflags
-function sets the 
+function sets the
 .Ar flags
 described above. Note that using both MIME flags together can also
 return extra information on the charset.
@@ -219,7 +219,7 @@ functions return 0 on success and -1 on failure.
 The
 .Fn magic_file ,
 and
-.Fn magic_buffer 
+.Fn magic_buffer
 functions return a string on success and NULL on failure. The
 .Fn magic_error
 function returns a textual description of the errors of the above
@@ -242,7 +242,7 @@ The compiled default magic database.
 .El
 .Sh SEE ALSO
 .Xr file __CSECTION__ ,
-.Xr magic __FSECTION__ 
+.Xr magic __FSECTION__
 .Sh AUTHORS
 Måns Rullgård Initial libmagic implementation,
 and configuration.

+ 5 - 5
doc/magic.man

@@ -1,4 +1,4 @@
-.\" $File: magic.man,v 1.59 2008/11/06 23:22:53 christos Exp $
+.\" $File: magic.man,v 1.60 2009/05/08 23:02:44 christos Exp $
 .Dd August 30, 2008
 .Dt MAGIC __FSECTION__
 .Os
@@ -297,14 +297,14 @@ space.
 .El
 .Pp
 An APPLE 4+4 character APPLE creator and type can be specified as:
-.Bd -literal -offset indent 
+.Bd -literal -offset indent
 !:apple	CREATYPE
 .Ed
 .Pp
 A MIME type is given on a separate line, which must be the next
 non-blank or comment line after the magic line that identifies the
 file type, and has the following format:
-.Bd -literal -offset indent 
+.Bd -literal -offset indent
 !:mime	MIMETYPE
 .Ed
 .Pp
@@ -314,13 +314,13 @@ followed by the MIME type.
 .Pp
 An optional strength can be supplied on a separate line which refers to
 the current magic description using the following format:
-.Bd -literal -offset indent 
+.Bd -literal -offset indent
 !:strength OP VALUE
 .Ed
 .Pp
 The operand
 .Dv OP
-can be: 
+can be:
 .Dv + ,
 .Dv - ,
 .Dv * ,

+ 2 - 0
magic/Magdir/acorn

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: acorn,v 1.5 2009/09/19 16:28:07 christos Exp $
 # acorn:  file(1) magic for files found on Acorn systems
 #
 

+ 1 - 0
magic/Magdir/adi

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: adi,v 1.4 2009/09/19 16:28:07 christos Exp $
 # adi: file(1) magic for ADi's objects
 # From Gregory McGarry <g.mcgarry@ieee.org>
 #

+ 1 - 0
magic/Magdir/adventure

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: adventure,v 1.10 2009/09/19 16:28:07 christos Exp $
 # adventure: file(1) magic for Adventure game files
 #
 # from Allen Garvin <earendil@faeryland.tamu-commerce.edu>

+ 2 - 0
magic/Magdir/allegro

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: allegro,v 1.4 2009/09/19 16:28:07 christos Exp $
 # allegro:  file(1) magic for Allegro datafiles
 # Toby Deshane <hac@shoelace.digivill.net>
 #

+ 1 - 0
magic/Magdir/alliant

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: alliant,v 1.7 2009/09/19 16:28:07 christos Exp $
 # alliant:  file(1) magic for Alliant FX series a.out files
 #
 # If the FX series is the one that had a processor with a 68K-derived

+ 2 - 0
magic/Magdir/alpha

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: alpha,v 1.7 2009/09/19 16:28:07 christos Exp $
 # alpha architecture description
 #
 

+ 2 - 0
magic/Magdir/amanda

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: amanda,v 1.5 2009/09/19 16:28:07 christos Exp $
 # amanda:  file(1) magic for amanda file format
 #
 0	string	AMANDA:\ 		AMANDA 

+ 2 - 0
magic/Magdir/amigaos

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: amigaos,v 1.14 2009/09/19 16:28:07 christos Exp $
 # amigaos:  file(1) magic for AmigaOS binary formats:
 
 #

+ 16 - 10
magic/Magdir/animation

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: animation,v 1.39 2009/09/27 19:02:12 christos Exp $
 # animation:  file(1) magic for animation/movie formats
 #
 # animation formats
@@ -29,7 +30,7 @@
 #!:mime	image/x-quicktime
 4       string          pckg            Apple QuickTime compressed archive
 !:mime	application/x-quicktime-player
-4	string/B	jP		JPEG 2000 image
+4	string/W	jP		JPEG 2000 image
 !:mime	image/jp2
 4	string		ftyp		ISO Media
 >8	string		isom		\b, MPEG v4 system, version 1
@@ -41,7 +42,7 @@
 !:mime	video/mp4
 >8	string		mp7t		\b, MPEG v4 system, MPEG v7 XML
 >8	string		mp7b		\b, MPEG v4 system, MPEG v7 binary XML
->8	string/B	jp2		\b, JPEG 2000
+>8	string/W	jp2		\b, JPEG 2000
 !:mime	image/jp2
 >8	string		3gp		\b, MPEG v4 system, 3GPP
 !:mime	video/3gpp
@@ -52,13 +53,13 @@
 !:mime	video/mp4
 >8	string		avc1		\b, MPEG v4 system, 3GPP JVT AVC
 !:mime	video/3gpp
->8	string/B	M4A		\b, MPEG v4 system, iTunes AAC-LC
+>8	string/W	M4A		\b, MPEG v4 system, iTunes AAC-LC
 !:mime	audio/mp4
->8	string/B	M4V		\b, MPEG v4 system, iTunes AVC-LC
+>8	string/W	M4V		\b, MPEG v4 system, iTunes AVC-LC
 !:mime	video/mp4
->8	string/B	M4P		\b, MPEG v4 system, iTunes AES encrypted
->8	string/B	M4B		\b, MPEG v4 system, iTunes bookmarked
->8	string/B	qt		\b, Apple QuickTime movie
+>8	string/W	M4P		\b, MPEG v4 system, iTunes AES encrypted
+>8	string/W	M4B		\b, MPEG v4 system, iTunes bookmarked
+>8	string/W	qt		\b, Apple QuickTime movie
 !:mime	video/quicktime
 
 # MPEG sequences
@@ -71,6 +72,7 @@
 >>7      byte               x              \b @ L %u
 0        belong&0xFFFFFF00  0x00000100     
 >3       byte               0xBA           MPEG sequence
+!:mime  video/mpeg
 >>4      byte               &0x40          \b, v2, program multiplex
 >>4      byte               ^0x40          \b, v1, system multiplex
 >3       byte               0xBB           MPEG sequence, v1/2, multiplex (missing pack header)
@@ -80,6 +82,7 @@
 >>4      byte               88             \b, extended
 >>6      byte               x              \b @ L %u
 >3       byte               0xB0           MPEG sequence, v4
+!:mime  video/mpeg4-generic
 >>5      belong             0x000001B5
 >>>9     byte               &0x80
 >>>>10   byte&0xF0          16             \b, video
@@ -469,6 +472,7 @@
 
 # MPA, M2A
 0       beshort&0xFFFE  0xFFF6         MPEG ADTS, layer I, v2
+!:mime	audio/mpeg
 # rate
 >2      byte&0xF0       0x10           \b,  32 kbps
 >2      byte&0xF0       0x20           \b,  48 kbps
@@ -503,6 +507,7 @@
 
 # MP3, M25A
 0       beshort&0xFFFE  0xFFE2         MPEG ADTS, layer III,  v2.5
+!:mime	audio/mpeg
 # rate  
 >2      byte&0xF0       0x10           \b,   8 kbps
 >2      byte&0xF0       0x20           \b,  16 kbps
@@ -697,6 +702,7 @@
 
 # Microsoft Advanced Streaming Format (ASF) <mpruett@sgi.com>
 0	belong			0x3026b275	Microsoft ASF
+!:mime  video/x-ms-asf
 
 # MNG Video Format, <URL:http://www.libpng.org/pub/mng/spec/>
 0	string			\x8aMNG		MNG video data,
@@ -718,16 +724,16 @@
 3	string		\x0D\x0AVersion:Vivo	Vivo video data
 
 # VRML (Virtual Reality Modelling Language)
-0       string/b        #VRML\ V1.0\ ascii	VRML 1 file
+0       string/w        #VRML\ V1.0\ ascii	VRML 1 file
 !:mime	model/vrml
-0	string/b	#VRML\ V2.0\ utf8	ISO/IEC 14772 VRML 97 file
+0	string/w	#VRML\ V2.0\ utf8	ISO/IEC 14772 VRML 97 file
 !:mime	model/vrml
 
 # X3D (Extensible 3D) [http://www.web3d.org/specifications/x3d-3.0.dtd]
 # From Michel Briand <michelbriand@free.fr>
 0	string		\<?xml\ version="
 !:strength +1
->20	search/1000/cb  \<!DOCTYPE\ X3D		X3D (Extensible 3D) model xml text
+>20	search/1000/cw  \<!DOCTYPE\ X3D		X3D (Extensible 3D) model xml text
 !:mime model/x3d
 
 #---------------------------------------------------------------------------

+ 1 - 0
magic/Magdir/apl

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: apl,v 1.6 2009/09/19 16:28:07 christos Exp $
 # apl:  file(1) magic for APL (see also "pdp" and "vax" for other APL
 #       workspaces)
 #

+ 2 - 0
magic/Magdir/apple

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: apple,v 1.23 2009/09/19 16:28:08 christos Exp $
 # apple:  file(1) magic for Apple file formats
 #
 0	search/1	FiLeStArTfIlEsTaRt	binscii (apple ][) text

+ 1 - 0
magic/Magdir/applix

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: applix,v 1.5 2009/09/19 16:28:08 christos Exp $
 # applix:  file(1) magic for Applixware
 # From: Peter Soos <sp@osb.hu>
 #

+ 80 - 53
magic/Magdir/archive

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: archive,v 1.55 2009/12/04 15:00:47 christos Exp $
 # archive:  file(1) magic for archive formats (see also "msdos" for self-
 #           extracting compressed archives)
 #
@@ -560,79 +562,105 @@
 # [JW] see exe section for self-extracting version
 0	string		UC2\x1a		UC2 archive data
 
+# PKZIP multi-volume archive
+0	string		PK\x07\x08PK\x03\x04	Zip multi-volume archive data, at least PKZIP v2.50 to extract
+!:mime	application/zip
+
 # ZIP archives (Greg Roelofs, c/o zip-bugs@wkuvx1.wku.edu)
 0	string		PK\003\004
->4	byte		0x00		Zip archive data
+>30	ubelong		!0x6d696d65
+>>4	byte		0x00		Zip archive data
 !:mime	application/zip
->4	byte		0x09		Zip archive data, at least v0.9 to extract
+>>4	byte		0x09		Zip archive data, at least v0.9 to extract
 !:mime	application/zip
->4	byte		0x0a		Zip archive data, at least v1.0 to extract
+>>4	byte		0x0a		Zip archive data, at least v1.0 to extract
 !:mime	application/zip
->4	byte		0x0b		Zip archive data, at least v1.1 to extract
+>>4	byte		0x0b		Zip archive data, at least v1.1 to extract
 !:mime	application/zip
->0x161	string		WINZIP          Zip archive data, WinZIP self-extracting
+>>0x161	string		WINZIP          Zip archive data, WinZIP self-extracting
 !:mime	application/zip
->4	byte		0x14
->>30	ubelong		!0x6d696d65	Zip archive data, at least v2.0 to extract
+>>4	byte		0x14		Zip archive data, at least v2.0 to extract
 !:mime	application/zip
 
 # OpenOffice.org / KOffice / StarOffice documents
 # Listed here because they ARE zip files
 #
 # From: Abel Cheung <abel@oaka.org>
->4	byte		0x14
->>30	string		mimetype
+>30	string		mimetype
 
 # KOffice (1.2 or above) formats
->>>50	string	vnd.kde.		KOffice (>=1.2)
->>>>58	string	karbon			Karbon document
->>>>58	string	kchart			KChart document
->>>>58	string	kformula		KFormula document
->>>>58	string	kivio			Kivio document
->>>>58	string	kontour			Kontour document
->>>>58	string	kpresenter		KPresenter document
->>>>58	string	kspread			KSpread document
->>>>58	string	kword			KWord document
+>>50	string	vnd.kde.		KOffice (>=1.2)
+>>>58	string	karbon			Karbon document
+>>>58	string	kchart			KChart document
+>>>58	string	kformula		KFormula document
+>>>58	string	kivio			Kivio document
+>>>58	string	kontour			Kontour document
+>>>58	string	kpresenter		KPresenter document
+>>>58	string	kspread			KSpread document
+>>>58	string	kword			KWord document
 
 # OpenOffice formats (for OpenOffice 1.x / StarOffice 6/7)
->>>50	string	vnd.sun.xml.		OpenOffice.org 1.x
->>>>62	string	writer			Writer
->>>>>68	byte	!0x2e			document
->>>>>68	string	.template		template
->>>>>68	string	.global			global document
->>>>62	string	calc			Calc
->>>>>66	byte	!0x2e			spreadsheet
->>>>>66	string	.template		template
->>>>62	string	draw			Draw
->>>>>66	byte	!0x2e			document
->>>>>66	string	.template		template
->>>>62	string	impress			Impress
->>>>>69	byte	!0x2e			presentation
->>>>>69	string	.template		template
->>>>62	string	math			Math document
->>>>62	string	base			Database file
+>>50	string	vnd.sun.xml.		OpenOffice.org 1.x
+>>>62	string	writer			Writer
+>>>>68	byte	!0x2e			document
+>>>>68	string	.template		template
+>>>>68	string	.global			global document
+>>>62	string	calc			Calc
+>>>>66	byte	!0x2e			spreadsheet
+>>>>66	string	.template		template
+>>>62	string	draw			Draw
+>>>>66	byte	!0x2e			document
+>>>>66	string	.template		template
+>>>62	string	impress			Impress
+>>>>69	byte	!0x2e			presentation
+>>>>69	string	.template		template
+>>>62	string	math			Math document
+>>>62	string	base			Database file
 
 # OpenDocument formats (for OpenOffice 2.x / StarOffice >= 8)
 # http://lists.oasis-open.org/archives/office/200505/msg00006.html
->>>50	string	vnd.oasis.opendocument.	OpenDocument
->>>>73	string	text
->>>>>77	byte	!0x2d			Text
+>>50	string	vnd.oasis.opendocument.	OpenDocument
+>>>73	string	text
+>>>>77	byte	!0x2d			Text
 !:mime	application/vnd.oasis.opendocument.text
->>>>>77	string	-template		Text Template
->>>>>77	string	-web			HTML Document Template
->>>>>77	string	-master			Master Document
->>>>73	string	graphics		Drawing
->>>>>81	string	-template		Template
->>>>73	string	presentation		Presentation
->>>>>85	string	-template		Template
->>>>73	string	spreadsheet		Spreadsheet
->>>>>84	string	-template		Template
->>>>73	string	chart			Chart
->>>>>78	string	-template		Template
->>>>73	string	formula			Formula
->>>>>80	string	-template		Template
->>>>73	string	database		Database
->>>>73	string	image			Image
+>>>>77	string	-template		Text Template
+!:mime	application/vnd.oasis.opendocument.text-template
+>>>>77	string	-web			HTML Document Template
+!:mime	application/vnd.oasis.opendocument.text-web
+>>>>77	string	-master			Master Document
+!:mime	application/vnd.oasis.opendocument.text-master
+>>>73	string	graphics
+>>>>81	byte	!0x2d			Drawing
+!:mime	application/vnd.oasis.opendocument.graphics
+>>>>81	string	-template		Template
+!:mime	application/vnd.oasis.opendocument.graphics-template
+>>>73	string	presentation
+>>>>85	byte	!0x2d			Presentation
+!:mime	application/vnd.oasis.opendocument.presentation
+>>>>85	string	-template		Template
+!:mime	application/vnd.oasis.opendocument.presentation-template
+>>>73	string	spreadsheet
+>>>>84	byte	!0x2d			Spreadsheet
+!:mime	application/vnd.oasis.opendocument.spreadsheet
+>>>>84	string	-template		Template
+!:mime	application/vnd.oasis.opendocument.spreadsheet-template
+>>>73	string	chart
+>>>>78	byte	!0x2d			Chart
+!:mime	application/vnd.oasis.opendocument.chart
+>>>>78	string	-template		Template
+!:mime	application/vnd.oasis.opendocument.chart-template
+>>>73	string	formula
+>>>>80	byte	!0x2d			Formula
+!:mime	application/vnd.oasis.opendocument.formula
+>>>>80	string	-template		Template
+!:mime	application/vnd.oasis.opendocument.formula-template
+>>>73	string	database		Database
+!:mime	application/vnd.oasis.opendocument.database
+>>>73	string	image
+>>>>78	byte	!0x2d			Image
+!:mime	application/vnd.oasis.opendocument.image
+>>>>78	string	-template		Template
+!:mime	application/vnd.oasis.opendocument.image-template
 
 # Zoo archiver
 20	lelong		0xfdc4a7dc	Zoo archive data
@@ -802,4 +830,3 @@
 >24	belong	0		no checksum
 >24	belong	1		SHA-1 checksum
 >24	belong	2		MD5 checksum
-

+ 1 - 0
magic/Magdir/asterix

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: asterix,v 1.5 2009/09/19 16:28:08 christos Exp $
 # asterix:  file(1) magic for Aster*x; SunOS 5.5.1 gave the 4-character
 # strings as "long" - we assume they're just strings:
 # From: guy@netapp.com (Guy Harris)

+ 1 - 0
magic/Magdir/att3b

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: att3b,v 1.8 2009/09/19 16:28:08 christos Exp $
 # att3b:  file(1) magic for AT&T 3B machines
 #
 # The `versions' should be un-commented if they work for you.

+ 4 - 2
magic/Magdir/audio

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: audio,v 1.59 2009/11/04 17:27:37 christos Exp $
 # audio:  file(1) magic for sound formats (see also "iff")
 #
 # Jan Nicolai Langfeldt (janl@ifi.uio.no), Dan Quinlan (quinlan@yggdrasil.com),
@@ -276,8 +278,8 @@
 >21	ubyte		<128			note %d,
 >22	byte		=0			replay 5.485 KHz
 >22	byte		=1			replay 8.084 KHz
->22	byte		=2			replay 10.971 Khz
->22	byte		=3			replay 16.168 Khz
+>22	byte		=2			replay 10.971 KHz
+>22	byte		=3			replay 16.168 KHz
 >22	byte		=4			replay 21.942 KHz
 >22	byte		=5			replay 32.336 KHz
 >22	byte		=6			replay 43.885 KHz

+ 2 - 0
magic/Magdir/basis

@@ -1,4 +1,6 @@
+
 #----------------------------------------------------------------
+# $File: basis,v 1.4 2009/09/19 16:28:08 christos Exp $
 # basis: file(1) magic for BBx/Pro5-files
 #      Oliver Dammer <dammer@olida.de>	 2005/11/07
 # http://www.basis.com business-basic-files.

+ 2 - 0
magic/Magdir/bflt

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: bflt,v 1.4 2009/09/19 16:28:08 christos Exp $
 # bFLT: file(1) magic for BFLT uclinux binary files
 #
 # From Philippe De Muyter <phdm@macqel.be>

+ 2 - 0
magic/Magdir/blender

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: blender,v 1.5 2009/09/19 16:28:08 christos Exp $
 # blender: file(1) magic for Blender 3D related files
 #
 # Native format rule v1.2. For questions use the developers list 

+ 1 - 0
magic/Magdir/blit

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: blit,v 1.8 2009/09/19 16:28:08 christos Exp $
 # blit:  file(1) magic for 68K Blit stuff as seen from 680x0 machine
 #
 # Note that this 0407 conflicts with several other a.out formats...

+ 3 - 1
magic/Magdir/bout

@@ -1,4 +1,6 @@
-#
+
+#------------------------------------------------------------------------------
+# $File: bout,v 1.5 2009/09/19 16:28:08 christos Exp $
 # i80960 b.out objects and archives
 #
 0	long		0x10d		i960 b.out relocatable object

+ 2 - 0
magic/Magdir/bsdi

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: bsdi,v 1.5 2009/09/19 16:28:08 christos Exp $
 # bsdi:  file(1) magic for BSD/OS (from BSDI) objects
 #
 

+ 2 - 0
magic/Magdir/btsnoop

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: btsnoop,v 1.5 2009/09/19 16:28:08 christos Exp $
 # BTSnoop:  file(1) magic for BTSnoop files
 #
 # From <marcel@holtmann.org>

+ 2 - 0
magic/Magdir/c-lang

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: c-lang,v 1.14 2009/09/19 16:28:08 christos Exp $
 # c-lang:  file(1) magic for C programs (or REXX)
 #
 

+ 2 - 0
magic/Magdir/c64

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: c64,v 1.5 2009/09/19 16:28:08 christos Exp $
 # c64:  file(1) magic for various commodore 64 related files
 #
 # From: Dirk Jagdmann <doj@cubic.org>

+ 1 - 0
magic/Magdir/cad

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: cad,v 1.9 2009/09/19 16:28:08 christos Exp $
 # autocad:  file(1) magic for cad files
 #
 

+ 2 - 0
magic/Magdir/cafebabe

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: cafebabe,v 1.8 2009/09/19 16:28:08 christos Exp $
 # Cafe Babes unite!
 #
 # Since Java bytecode and Mach-O fat-files have the same magic number, the test

+ 3 - 1
magic/Magdir/cddb

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: cddb,v 1.4 2009/09/19 16:28:08 christos Exp $
 # CDDB: file(1) magic for CDDB(tm) format CD text data files
 #
 # From <steve@gracenote.com>
@@ -7,4 +9,4 @@
 # CDDB-enabled CD player applications.
 #
 
-0	search/1/b	#\040xmcd	CDDB(tm) format CD text data
+0	search/1/w	#\040xmcd	CDDB(tm) format CD text data

+ 1 - 0
magic/Magdir/chord

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: chord,v 1.4 2009/09/19 16:28:08 christos Exp $
 # chord: file(1) magic for Chord music sheet typesetting utility input files
 #
 # From Philippe De Muyter <phdm@macqel.be>

+ 2 - 0
magic/Magdir/cisco

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: cisco,v 1.4 2009/09/19 16:28:08 christos Exp $
 # cisco:  file(1) magic for cisco Systems routers
 #
 # Most cisco file-formats are covered by the generic elf code

+ 2 - 0
magic/Magdir/citrus

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: citrus,v 1.4 2009/09/19 16:28:08 christos Exp $
 # citrus locale declaration
 #
 

+ 1 - 0
magic/Magdir/clarion

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: clarion,v 1.4 2009/09/19 16:28:08 christos Exp $
 # clarion:  file(1) magic for # Clarion Personal/Professional Developer
 # (v2 and above)
 # From: Julien Blache <jb@jblache.org>

+ 1 - 0
magic/Magdir/claris

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: claris,v 1.5 2009/09/19 16:28:08 christos Exp $
 # claris:  file(1) magic for claris
 # "H. Nanosecond" <aldomel@ix.netcom.com>
 # Claris Works a word processor, etc.

+ 1 - 0
magic/Magdir/clipper

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: clipper,v 1.6 2009/09/19 16:28:08 christos Exp $
 # clipper:  file(1) magic for Intergraph (formerly Fairchild) Clipper.
 #
 # XXX - what byte order does the Clipper use?

+ 26 - 25
magic/Magdir/commands

@@ -1,62 +1,63 @@
 
 #------------------------------------------------------------------------------
+# $File: commands,v 1.36 2010/01/24 18:41:11 christos Exp $
 # commands:  file(1) magic for various shells and interpreters
 #
 #0	string		:			shell archive or script for antique kernel text
-0	string/b	#!\ /bin/sh		POSIX shell script text executable
+0	string/w	#!\ /bin/sh		POSIX shell script text executable
 !:mime	text/x-shellscript
-0	string/b	#!\ /bin/csh		C shell script text executable
+0	string/w	#!\ /bin/csh		C shell script text executable
 !:mime	text/x-shellscript
 # korn shell magic, sent by George Wu, gwu@clyde.att.com
-0	string/b	#!\ /bin/ksh		Korn shell script text executable
+0	string/w	#!\ /bin/ksh		Korn shell script text executable
 !:mime	text/x-shellscript
-0	string/b 	#!\ /bin/tcsh		Tenex C shell script text executable
+0	string/w 	#!\ /bin/tcsh		Tenex C shell script text executable
 !:mime	text/x-shellscript
-0	string/b 	#!\ /usr/local/tcsh	Tenex C shell script text executable
+0	string/w 	#!\ /usr/local/tcsh	Tenex C shell script text executable
 !:mime	text/x-shellscript
-0	string/b	#!\ /usr/local/bin/tcsh	Tenex C shell script text executable
+0	string/w	#!\ /usr/local/bin/tcsh	Tenex C shell script text executable
 !:mime	text/x-shellscript
 
 #
 # zsh/ash/ae/nawk/gawk magic from cameron@cs.unsw.oz.au (Cameron Simpson)
-0	string/b	#!\ /bin/zsh		Paul Falstad's zsh script text executable
+0	string/w	#!\ /bin/zsh		Paul Falstad's zsh script text executable
 !:mime	text/x-shellscript
-0	string/b	#!\ /usr/bin/zsh	Paul Falstad's zsh script text executable
+0	string/w	#!\ /usr/bin/zsh	Paul Falstad's zsh script text executable
 !:mime	text/x-shellscript
-0	string/b	#!\ /usr/local/bin/zsh	Paul Falstad's zsh script text executable
+0	string/w	#!\ /usr/local/bin/zsh	Paul Falstad's zsh script text executable
 !:mime	text/x-shellscript
-0	string/b	#!\ /usr/local/bin/ash	Neil Brown's ash script text executable
+0	string/w	#!\ /usr/local/bin/ash	Neil Brown's ash script text executable
 !:mime	text/x-shellscript
-0	string/b	#!\ /usr/local/bin/ae	Neil Brown's ae script text executable
+0	string/w	#!\ /usr/local/bin/ae	Neil Brown's ae script text executable
 !:mime	text/x-shellscript
-0	string/b	#!\ /bin/nawk		new awk script text executable
+0	string/w	#!\ /bin/nawk		new awk script text executable
 !:mime	text/x-nawk
-0	string/b	#!\ /usr/bin/nawk	new awk script text executable
+0	string/w	#!\ /usr/bin/nawk	new awk script text executable
 !:mime	text/x-nawk
-0	string/b	#!\ /usr/local/bin/nawk	new awk script text executable
+0	string/w	#!\ /usr/local/bin/nawk	new awk script text executable
 !:mime	text/x-nawk
-0	string/b	#!\ /bin/gawk		GNU awk script text executable
+0	string/w	#!\ /bin/gawk		GNU awk script text executable
 !:mime	text/x-gawk
-0	string/b	#!\ /usr/bin/gawk	GNU awk script text executable
+0	string/w	#!\ /usr/bin/gawk	GNU awk script text executable
 !:mime	text/x-gawk
-0	string/b	#!\ /usr/local/bin/gawk	GNU awk script text executable
+0	string/w	#!\ /usr/local/bin/gawk	GNU awk script text executable
 !:mime	text/x-gawk
 #
-0	string/b	#!\ /bin/awk		awk script text executable
+0	string/w	#!\ /bin/awk		awk script text executable
 !:mime	text/x-awk
-0	string/b	#!\ /usr/bin/awk	awk script text executable
+0	string/w	#!\ /usr/bin/awk	awk script text executable
 !:mime	text/x-awk
 # update to distinguish from *.vcf files
 # this is broken because postscript has /EBEGIN{ for example.
-#0	search/Bb	BEGIN {			awk script text
+#0	search/Ww	BEGIN {			awk script text
 
 # AT&T Bell Labs' Plan 9 shell
-0	string/b	#!\ /bin/rc	Plan 9 rc shell script text executable
+0	string/w	#!\ /bin/rc	Plan 9 rc shell script text executable
 
 # bash shell magic, from Peter Tobias (tobias@server.et-inf.fho-emden.de)
-0	string/b	#!\ /bin/bash	Bourne-Again shell script text executable
+0	string/w	#!\ /bin/bash	Bourne-Again shell script text executable
 !:mime	text/x-shellscript
-0	string/b	#!\ /usr/local/bin/bash	Bourne-Again shell script text executable
+0	string/w	#!\ /usr/local/bin/bash	Bourne-Again shell script text executable
 !:mime	text/x-shellscript
 
 # using env
@@ -73,9 +74,9 @@
 !:mime	text/x-php
 0	search/1	=<?\r			PHP script text
 !:mime	text/x-php
-0	search/1/b	#!\ /usr/local/bin/php	PHP script text executable
+0	search/1/w	#!\ /usr/local/bin/php	PHP script text executable
 !:mime	text/x-php
-0	search/1/b	#!\ /usr/bin/php	PHP script text executable
+0	search/1/w	#!\ /usr/bin/php	PHP script text executable
 !:mime	text/x-php
 
 0	string		Zend\x00		PHP script Zend Optimizer data

+ 1 - 0
magic/Magdir/communications

@@ -1,5 +1,6 @@
 
 #----------------------------------------------------------------------------
+# $File: communications,v 1.5 2009/09/19 16:28:08 christos Exp $
 # communication
 
 # TTCN is the Tree and Tabular Combined Notation described in ISO 9646-3.

+ 1 - 0
magic/Magdir/compress

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: compress,v 1.42 2009/09/19 16:28:08 christos Exp $
 # compress:  file(1) magic for pure-compression formats (no archives)
 #
 # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc.

+ 2 - 0
magic/Magdir/console

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: console,v 1.16 2009/09/19 16:28:08 christos Exp $
 # Console game magic
 # Toby Deshane <hac@shoelace.digivill.net>
 #    ines:  file(1) magic for Marat's iNES Nintendo Entertainment System

+ 2 - 0
magic/Magdir/convex

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: convex,v 1.7 2009/09/19 16:28:08 christos Exp $
 # convex:  file(1) magic for Convex boxes
 #
 # Convexes are big-endian.

+ 1 - 0
magic/Magdir/cracklib

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: cracklib,v 1.7 2009/09/19 16:28:08 christos Exp $
 # cracklib:  file (1) magic for cracklib v2.7
 
 0	lelong	0x70775631	Cracklib password index, little endian

+ 2 - 0
magic/Magdir/ctags

@@ -1,4 +1,6 @@
+
 # ----------------------------------------------------------------------------
+# $File: ctags,v 1.6 2009/09/19 16:28:08 christos Exp $
 # ctags:  file (1) magic for Exuberant Ctags files
 # From: Alexander Mai <mai@migdal.ikp.physik.tu-darmstadt.de>
 0	search/1	=!_TAG	Exuberant Ctags tag file text

+ 1 - 0
magic/Magdir/dact

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: dact,v 1.4 2009/09/19 16:28:08 christos Exp $
 # dact:  file(1) magic for DACT compressed files
 #
 0	long		0x444354C3	DACT compressed data

+ 1 - 0
magic/Magdir/database

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: database,v 1.24 2009/09/19 16:28:08 christos Exp $
 # database:  file(1) magic for various databases
 #
 # extracted from header/code files by Graeme Wilford (eep2gw@ee.surrey.ac.uk)

+ 1 - 0
magic/Magdir/diamond

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: diamond,v 1.7 2009/09/19 16:28:08 christos Exp $
 # diamond:  file(1) magic for Diamond system
 #
 # ... diamond is a multi-media mail and electronic conferencing system....

+ 5 - 0
magic/Magdir/diff

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: diff,v 1.10 2009/09/19 16:28:08 christos Exp $
 # diff:  file(1) magic for diff(1) output
 #
 0	search/1	diff\ 		diff output text
@@ -12,3 +14,6 @@
 
 0	search/1	Index:		RCS/CVS diff output text
 !:mime	text/x-diff
+
+# bsdiff:  file(1) magic for bsdiff(1) output
+0	string		BSDIFF40	bsdiff(1) patch file

+ 3 - 0
magic/Magdir/digital

@@ -1,3 +1,6 @@
+
+#------------------------------------------------------------------------------
+# $File: digital,v 1.8 2009/09/19 16:28:08 christos Exp $
 #  Digital UNIX - Info
 #
 0	string	=!<arch>\n________64E	Alpha archive

+ 3 - 0
magic/Magdir/dolby

@@ -1,3 +1,6 @@
+
+#------------------------------------------------------------------------------
+# $File: dolby,v 1.5 2009/09/19 16:28:08 christos Exp $
 # ATSC A/53 aka AC-3 aka Dolby Digital <ashitaka@gmx.at>
 # from http://www.atsc.org/standards/a_52a.pdf
 # corrections, additions, etc. are always welcome!

+ 1 - 0
magic/Magdir/dump

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: dump,v 1.11 2009/09/19 16:28:09 christos Exp $
 # dump:  file(1) magic for dump file format--for new and old dump filesystems
 #
 # We specify both byte orders in order to recognize byte-swapped dumps.

+ 1 - 0
magic/Magdir/dyadic

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: dyadic,v 1.4 2009/09/19 16:28:09 christos Exp $
 # Dyadic: file(1) magic for Dyalog APL.
 #
 0 	byte	0xaa

+ 1 - 0
magic/Magdir/editors

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: editors,v 1.8 2009/09/19 16:28:09 christos Exp $
 # T602 editor documents 
 # by David Necas <yeti@physics.muni.cz>
 0	string	@CT\ 	T602 document data,

+ 1 - 0
magic/Magdir/efi

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: efi,v 1.4 2009/09/19 16:28:09 christos Exp $
 # efi:  file(1) magic for Universal EFI binaries
 
 0	lelong	0x0ef1fab9

+ 1 - 0
magic/Magdir/elf

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: elf,v 1.53 2009/09/19 16:28:09 christos Exp $
 # elf:  file(1) magic for ELF executables
 #
 # We have to check the byte order flag to see what byte order all the

+ 1 - 0
magic/Magdir/encore

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: encore,v 1.6 2009/09/19 16:28:09 christos Exp $
 # encore:  file(1) magic for Encore machines
 #
 # XXX - needs to have the byte order specified (NS32K was little-endian,

+ 48 - 6
magic/Magdir/epoc

@@ -1,11 +1,53 @@
+
 #------------------------------------------------------------------------------
+# $File: epoc,v 1.7 2009/09/19 16:28:09 christos Exp $
 # EPOC : file(1) magic for EPOC documents [Psion Series 5/Osaris/Geofox 1]
-# Stefan Praszalowicz (hpicollo@worldnet.fr)
+# Stefan Praszalowicz <hpicollo@worldnet.fr> and Peter Breitenlohner <peb@mppmu.mpg.de>
 # Useful information for improving this file can be found at:
 # http://software.frodo.looijaard.name/psiconv/formats/Index.html
-0	lelong		0x10000037
+#------------------------------------------------------------------------------
+0	lelong		0x10000037	Psion Series 5
+>4	lelong		0x10000039	font file
+>4	lelong		0x1000003A	printer driver
+>4	lelong		0x1000003B	clipboard
+>4	lelong		0x10000042	multi-bitmap image
+!:mime image/x-epoc-mbm
+>4	lelong		0x1000006A	application information file
 >4	lelong		0x1000006D
->>8	lelong		0x1000007F	Psion Word
->>8	lelong		0x10000088	Psion Sheet
->>8	lelong		0x1000007D	Psion Sketch
->>8	lelong		0x10000085	Psion TextEd
+>>8	lelong		0x1000007D	Sketch image
+!:mime image/x-epoc-sketch
+>>8	lelong		0x1000007E	voice note
+>>8	lelong		0x1000007F	Word file
+!:mime application/x-epoc-word
+>>8	lelong		0x10000085	OPL program (TextEd)
+!:mime application/x-epoc-opl
+>>8	lelong		0x10000088	Sheet file
+!:mime application/x-epoc-sheet
+>>8	lelong		0x100001C4	EasyFax initialisation file
+>4	lelong		0x10000073	OPO module
+!:mime application/x-epoc-opo
+>4	lelong		0x10000074	OPL application
+!:mime application/x-epoc-app
+>4	lelong		0x1000008A	exported multi-bitmap image
+
+0	lelong		0x10000041	Psion Series 5 ROM multi-bitmap image
+
+0	lelong		0x10000050	Psion Series 5
+>4	lelong		0x1000006D	database
+>4	lelong		0x100000E4	ini file
+
+0	lelong		0x10000079	Psion Series 5 binary:
+>4	lelong		0x00000000	DLL
+>4	lelong		0x10000049	comms hardware library
+>4	lelong		0x1000004A	comms protocol library
+>4	lelong		0x1000005D	OPX
+>4	lelong		0x1000006C	application
+>4	lelong		0x1000008D	DLL
+>4	lelong		0x100000AC	logical device driver
+>4	lelong		0x100000AD	physical device driver
+>4	lelong		0x100000E5	file transfer protocol
+>4	lelong		0x100000E5	file transfer protocol
+>4	lelong		0x10000140	printer definition
+>4	lelong		0x10000141	printer definition
+
+0	lelong		0x1000007A	Psion Series 5 executable

+ 1 - 0
magic/Magdir/erlang

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: erlang,v 1.5 2009/09/19 16:28:09 christos Exp $
 # erlang:  file(1) magic for Erlang JAM and BEAM files
 # URL:  http://www.erlang.org/faq/x779.html#AEN812
 

+ 1 - 0
magic/Magdir/esri

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: esri,v 1.4 2009/09/19 16:28:09 christos Exp $
 # ESRI Shapefile format (.shp .shx .dbf=DBaseIII)
 # Based on info from
 # <URL:http://www.esri.com/library/whitepapers/pdfs/shapefile.pdf>

+ 1 - 0
magic/Magdir/fcs

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: fcs,v 1.4 2009/09/19 16:28:09 christos Exp $
 # fcs: file(1) magic for FCS (Flow Cytometry Standard) data files
 # From Roger Leigh <roger@whinlatter.uklinux.net>
 0       string          FCS1.0          Flow Cytometry Standard (FCS) data, version 1.0

+ 111 - 13
magic/Magdir/filesystems

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: filesystems,v 1.55 2010/01/16 17:45:12 chl Exp $
 # filesystems:  file(1) magic for different filesystems
 #
 0	string	\366\366\366\366	PC formatted floppy with no filesystem
@@ -202,7 +203,7 @@
 # http://www.bcdwb.de/bcdw/index_e.htm
 >3	string	BCDL				
 >>498	string	BCDL\ \ \ \ BIN			\b, Bootable CD Loader (1.50Z)
-# mbr partion table entries
+# mbr partition table entries
 # OEM-ID does not contain MicroSoft,NEWLDR,DOS,SYSLINUX,or MTOOLs
 >3			string		!MS
 >>3			string		!SYSLINUX
@@ -256,7 +257,7 @@
 #>>>>>>>>>>>>496		ubeshort&1023	x	\b, startcylinder? %d
 >>>>>>>>>>>>502		ulelong		x	\b, startsector %u
 >>>>>>>>>>>>506		ulelong		x	\b, %u sectors
-# mbr partion table entries end
+# mbr partition table entries end
 # http://www.acronis.de/
 #FAT label=ACRONIS\ SZ
 #OEM-ID=BOOTWIZ0
@@ -882,13 +883,37 @@
 
 
 # Minix filesystems - Juan Cespedes <cespedes@debian.org>
-0x410	leshort		0x137f		Minix filesystem
-0x410	beshort		0x137f		Minix filesystem (big endian)
->0x402	beshort		!0		\b, %d zones
+0x410	leshort		0x137f
+>0x402	beshort		< 100		Minix filesystem, V1, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	beshort		0x137f
+>0x402	beshort		< 100		Minix filesystem, V1 (big endian), %d zones
+>0x1e	string		minix		\b, bootable
+0x410	leshort		0x138f
+>0x402	beshort		< 100		Minix filesystem, V1, 30 char names, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	beshort		0x138f
+>0x402	beshort		< 100		Minix filesystem, V1, 30 char names (big endian), %d zones
+>0x1e	string		minix		\b, bootable
+0x410	leshort		0x2468
+>0x402	beshort		< 100		Minix filesystem, V2, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	beshort		0x2468
+>0x402	beshort		< 100		Minix filesystem, V2 (big endian), %d zones
+>0x1e	string		minix		\b, bootable
+
+0x410	leshort		0x2478
+>0x402	beshort		< 100		Minix filesystem, V2, 30 char names, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	leshort		0x2478
+>0x402	beshort		< 100		Minix filesystem, V2, 30 char names, %d zones
+>0x1e	string		minix		\b, bootable
+0x410	beshort		0x2478
+>0x402	beshort		!0		Minix filesystem, V2, 30 char names (big endian), %d zones
+>0x1e	string		minix		\b, bootable
+0x410	leshort		0x4d5a
+>0x402	beshort		!0		Minix filesystem, V3, %d zones
 >0x1e	string		minix		\b, bootable
-0x410	leshort		0x138f		Minix filesystem, 30 char names
-0x410	leshort		0x2468		Minix filesystem, version 2
-0x410	leshort		0x2478		Minix filesystem, version 2, 30 char names
 
 # romfs filesystems - Juan Cespedes <cespedes@debian.org>
 0	string		-rom1fs-	romfs filesystem, version 1
@@ -1211,6 +1236,9 @@
 !:mime	application/x-iso9660-image
 32776	string    CDROM     High Sierra CD-ROM filesystem data
 
+# .cso files
+0    string    CISO	Compressed ISO CD image
+
 # cramfs filesystem - russell@coker.com.au
 0       lelong    0x28cd3d45      Linux Compressed ROM File System data, little endian
 >4      lelong  x size %lu
@@ -1255,11 +1283,70 @@
 0	string	VoIP\ Startup\ and	Aculab VoIP firmware
 >35	string	x	format %s
 
-# u-boot/PPCBoot image file
-# From: Mark Brown <broonie@sirena.org.uk>
-0	belong	0x27051956	u-boot/PPCBoot image
->4	string  PPCBoot
->>12	string  x		version %s
+# From: Mark Brown <broonie@sirena.org.uk> [old]
+# From: Behan Webster <behanw@websterwood.com>
+0	belong	0x27051956	u-boot legacy uImage,
+>32	string	x		%s,
+>28	byte	0		Invalid os/
+>28	byte	1		OpenBSD/
+>28	byte	2		NetBSD/
+>28	byte	3		FreeBSD/
+>28	byte	4		4.4BSD/
+>28	byte	5		Linux/
+>28	byte	6		SVR4/
+>28	byte	7		Esix/
+>28	byte	8		Solaris/
+>28	byte	9		Irix/
+>28	byte	10		SCO/
+>28	byte	11		Dell/
+>28	byte	12		NCR/
+>28	byte	13		LynxOS/
+>28	byte	14		VxWorks/
+>28	byte	15		pSOS/
+>28	byte	16		QNX/
+>28	byte	17		Firmware/
+>28	byte	18		RTEMS/
+>28	byte	19		ARTOS/
+>28	byte	20		Unity OS/
+>28	byte	21		INTEGRITY/
+>29	byte	0		\bInvalid CPU,
+>29	byte	1		\bAlpha,
+>29	byte	2		\bARM,
+>29	byte	3		\bIntel x86,
+>29	byte	4		\bIA64,
+>29	byte	5		\bMIPS,
+>29	byte	6		\bMIPS 64-bit,
+>29	byte	7		\bPowerPC,
+>29	byte	8		\bIBM S390,
+>29	byte	9		\bSuperH,
+>29	byte	10		\bSparc,
+>29	byte	11		\bSparc 64-bit,
+>29	byte	12		\bM68K,
+>29	byte	13		\bNios-32,
+>29	byte	14		\bMicroBlaze,
+>29	byte	15		\bNios-II,
+>29	byte	16		\bBlackfin,
+>29	byte	17		\bAVR32,
+>29	byte	18		\bSTMicroelectronics ST200,
+>30	byte	0		Invalid Image
+>30	byte	1		Standalone Program
+>30	byte	2		OS Kernel Image
+>30	byte	3		RAMDisk Image
+>30	byte	4		Multi-File Image
+>30	byte	5		Firmware Image
+>30	byte	6		Script File
+>30	byte	7		Filesystem Image (any type)
+>30	byte	8		Binary Flat Device Tree BLOB
+>31	byte	0		(Not compressed),
+>31	byte	1		(gzip),
+>31	byte	2		(bzip2),
+>31	byte	3		(lzma),
+>12	belong	x		%d bytes,
+>8	bedate	x		%s,
+>16	belong	x		Load Address: 0x%08X,
+>20	belong	x		Entry Point: 0x%08X,
+>4	belong	x		Header CRC: 0x%08X,
+>24	belong	x		Data CRC: 0x%08X
 
 # JFFS2 file system
 0	leshort	0x1984		Linux old jffs2 filesystem data little endian
@@ -1312,6 +1399,10 @@
 >>>>>>>>&0      bedate          !0                      incremental since: %s
 
 #----------------------------------------------------------
+#delta ISO    Daniel Novotny (dnovotny@redhat.com)
+0	string  DISO	Delta ISO data
+>4	belong  x	version %d
+
 # VMS backup savesets - gerardo.cacciari@gmail.com
 #
 4            string  \x01\x00\x01\x00\x01\x00
@@ -1392,3 +1483,10 @@
 # dvdisaster's .ecc
 # From: "Nelson A. de Oliveira" <naoliv@gmail.com>
 0	string	*dvdisaster*	dvdisaster error correction file
+
+# xfs metadump image 
+# mb_magic XFSM at 0; superblock magic XFSB at 1 << mb_blocklog
+# but can we do the << ?  For now it's always 512 (0x200) anyway.
+0	string XFSM
+>0x200	string XFSB	XFS filesystem metadump image
+

+ 4 - 0
magic/Magdir/flash

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: flash,v 1.9 2009/11/08 01:30:01 christos Exp $
 # flash:	file(1) magic for Macromedia Flash file format
 #
 # See
@@ -17,5 +18,8 @@
 !:mime	video/x-flv
 
 #
+# Yosu Gomez
+0       string AGD2\xbe\xb8\xbb\xcd\x00 Macromedia Freehand 7 Document
+0       string AGD3\xbe\xb8\xbb\xcc\x00 Macromedia Freehand 8 Document
 # From Dave Wilson
 0	string AGD4\xbe\xb8\xbb\xcb\x00	Macromedia Freehand 9 Document

+ 9 - 1
magic/Magdir/fonts

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: fonts,v 1.21 2009/12/06 23:17:52 rrt Exp $
 # fonts:  file(1) magic for font data
 #
 0	search/1	FONT		ASCII vfont text
@@ -9,6 +11,9 @@
 0	string		%!PS-AdobeFont-1.	PostScript Type 1 font text
 >20	string		>\0			(%s)
 6	string		%!PS-AdobeFont-1.	PostScript Type 1 font program data
+0	string		%!FontType1	PostScript Type 1 font program data
+6	string		%!FontType1	PostScript Type 1 font program data
+0	string		%!PS-Adobe-3.0\ Resource-Font	PostScript Type 1 font text
 
 # X11 font files in SNF (Server Natural Format) format
 0	belong		00000004		X11 SNF font data, MSB first
@@ -51,6 +56,7 @@
 
 # True Type fonts
 0	string	\000\001\000\000\000	TrueType font data
+!:mime application/x-font-ttf
 
 0	string		\007\001\001\000Copyright\ (c)\ 199	Adobe Multiple Master font
 0	string		\012\001\001\000Copyright\ (c)\ 199	Adobe Multiple Master font
@@ -58,8 +64,10 @@
 0	string		ttcf		TrueType font collection data
 
 # Opentype font data from Avi Bercovich
-0	string		OTTO		OpenType font data 
+0	string		OTTO		OpenType font data
+!:mime application/vnd.ms-opentype
 
 # Gürkan Sengün <gurkan@linuks.mine.nu>, www.linuks.mine.nu 
 0	string		SplineFontDB:	Spline Font Database 
+!:mime application/vnd.font-fontforge-sfd
 >14	string		x		version %s

+ 3 - 0
magic/Magdir/fortran

@@ -1,3 +1,6 @@
+
+#------------------------------------------------------------------------------
+# $File: fortran,v 1.6 2009/09/19 16:28:09 christos Exp $
 # FORTRAN source
 0	regex/100	\^[Cc][\ \t]	FORTRAN program
 !:mime	text/x-fortran

+ 2 - 0
magic/Magdir/frame

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: frame,v 1.12 2009/09/19 16:28:09 christos Exp $
 # frame:  file(1) magic for FrameMaker files
 #
 # This stuff came on a FrameMaker demo tape, most of which is

+ 1 - 0
magic/Magdir/freebsd

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: freebsd,v 1.7 2009/09/19 16:28:09 christos Exp $
 # freebsd:  file(1) magic for FreeBSD objects
 #
 # All new-style FreeBSD magic numbers are in host byte order (i.e.,

+ 1 - 0
magic/Magdir/fsav

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: fsav,v 1.11 2009/09/19 16:28:09 christos Exp $
 # fsav:  file(1) magic for datafellows fsav virus definition files
 # Anthon van der Neut (anthon@mnt.org)
 

+ 2 - 0
magic/Magdir/games

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: games,v 1.8 2009/09/19 16:28:09 christos Exp $
 # games:  file(1) for games
 
 # Fabio Bonelli <fabiobonelli@libero.it>

+ 1 - 0
magic/Magdir/gcc

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: gcc,v 1.4 2009/09/19 16:28:09 christos Exp $
 # gcc:  file(1) magic for GCC special files
 #
 0	string		gpch		GCC precompiled header

+ 1 - 0
magic/Magdir/geos

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: geos,v 1.4 2009/09/19 16:28:09 christos Exp $
 # GEOS files (Vidar Madsen, vidar@gimp.org)
 # semi-commonly used in embedded and handheld systems.
 0	belong	0xc745c153	GEOS

+ 2 - 0
magic/Magdir/gimp

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: gimp,v 1.6 2009/09/19 16:28:09 christos Exp $
 # GIMP Gradient: file(1) magic for the GIMP's gradient data files
 # by Federico Mena <federico@nuclecu.unam.mx>
 

+ 3 - 0
magic/Magdir/gnome-keyring

@@ -1,3 +1,6 @@
+
+#------------------------------------------------------------------------------
+# $File: gnome-keyring,v 1.2 2009/09/19 16:28:09 christos Exp $
 # GNOME keyring
 # Contributed by Josh Triplett
 # FIXME: Could be simplified if pstring supported two-byte counts

+ 2 - 0
magic/Magdir/gnu

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: gnu,v 1.11 2009/09/19 16:28:09 christos Exp $
 # gnu:  file(1) magic for various GNU tools
 #
 # GNU nlsutils message catalog file format

+ 1 - 0
magic/Magdir/gnumeric

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: gnumeric,v 1.4 2009/09/19 16:28:09 christos Exp $
 # gnumeric:  file(1) magic for Gnumeric spreadsheet
 # This entry is only semi-helpful, as Gnumeric compresses its files, so
 # they will ordinarily reported as "compressed", but at least -z helps

+ 1 - 0
magic/Magdir/grace

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: grace,v 1.4 2009/09/19 16:28:09 christos Exp $
 # ACE/gr and Grace type files - PLEASE DO NOT REMOVE THIS LINE
 #
 # ACE/gr binary

+ 2 - 0
magic/Magdir/graphviz

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: graphviz,v 1.7 2009/09/19 16:28:09 christos Exp $
 # graphviz:  file(1) magic for http://www.graphviz.org/
 
 # FIXME: These patterns match too generally. For example, the first

+ 1 - 0
magic/Magdir/gringotts

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: gringotts,v 1.5 2009/09/19 16:28:09 christos Exp $
 # gringotts:  file(1) magic for Gringotts
 # http://devel.pluto.linux.it/projects/Gringotts/
 # author: Germano Rizzo <mano@pluto.linux.it>

+ 1 - 0
magic/Magdir/hitachi-sh

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: hitachi-sh,v 1.5 2009/09/19 16:28:09 christos Exp $
 # hitach-sh: file(1) magic for Hitachi Super-H
 #
 # Super-H COFF

+ 2 - 0
magic/Magdir/hp

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: hp,v 1.23 2009/09/19 16:28:09 christos Exp $
 # hp:  file(1) magic for Hewlett Packard machines (see also "printer")
 #
 # XXX - somebody should figure out whether any byte order needs to be

+ 1 - 0
magic/Magdir/human68k

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: human68k,v 1.5 2009/09/19 16:28:09 christos Exp $
 # human68k:  file(1) magic for Human68k (X680x0 DOS) binary formats
 # Magic too short!
 #0		string	HU		Human68k

+ 1 - 0
magic/Magdir/ibm370

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: ibm370,v 1.8 2009/09/19 16:28:09 christos Exp $
 # ibm370:  file(1) magic for IBM 370 and compatibles.
 #
 # "ibm370" said that 0x15d == 0535 was "ibm 370 pure executable".

+ 1 - 0
magic/Magdir/ibm6000

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: ibm6000,v 1.9 2009/09/19 16:28:09 christos Exp $
 # ibm6000:  file(1) magic for RS/6000 and the RT PC.
 #
 0	beshort		0x01df		executable (RISC System/6000 V3.1) or obj module

+ 1 - 0
magic/Magdir/iff

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: iff,v 1.12 2009/09/19 16:28:09 christos Exp $
 # iff:	file(1) magic for Interchange File Format (see also "audio" & "images")
 #
 # Daniel Quinlan (quinlan@yggdrasil.com) -- IFF was designed by Electronic

+ 27 - 2
magic/Magdir/images

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: images,v 1.64 2009/12/06 00:38:50 christos Exp $
 # images:  file(1) magic for image formats (see also "iff", and "c-lang" for
 # XPM bitmaps)
 #
@@ -75,7 +77,7 @@
 #
 # 137 P N G \r \n ^Z \n [4-byte length] H E A D [HEAD data] [HEAD crc] ...
 #
-0	string		\x89PNG\x0d\x0a\x1a\x0a		PNG image
+0	string		\x89PNG\x0d\x0a\x1a\x0a		PNG image data
 !:mime	image/png
 >16	belong		x		\b, %ld x
 >20	belong		x		%ld,
@@ -400,8 +402,28 @@
 >2	byte		1	RLE compressed
 
 # Adobe Photoshop
+# From: Asbjoern Sloth Toennesen <asbjorn@lila.io>
 0	string		8BPS Adobe Photoshop Image
 !:mime	image/vnd.adobe.photoshop
+>4   beshort 2 (PSB)
+>18  belong  x \b, %d x
+>14  belong  x %d,
+>24  beshort 0 bitmap
+>24  beshort 1 grayscale
+>>12 beshort 2 with alpha
+>24  beshort 2 indexed
+>24  beshort 3 RGB
+>>12 beshort 4 \bA
+>24  beshort 4 CMYK
+>>12 beshort 5 \bA
+>24  beshort 7 multichannel
+>24  beshort 8 duotone
+>24  beshort 9 lab
+>12  beshort > 1
+>>12  beshort x \b, %dx
+>12  beshort 1 \b,
+>22  beshort x %d-bit channel
+>12  beshort > 1 \bs
 
 # XV thumbnail indicator (ThMO)
 0	string		P7\ 332		XV thumbnail image data
@@ -546,11 +568,14 @@
 # Submitted by: Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
 # Modified by (1): Abel Cheung <abelcheung@gmail.com>
 0	string	AT&TFORM
-!:mime	image/vnd.djvu
 >12	string	DJVM		DjVu multiple page document
+!:mime	image/vnd.djvu
 >12	string	DJVU		DjVu image or single page document
+!:mime	image/vnd.djvu
 >12	string	DJVI		DjVu shared document
+!:mime	image/vnd.djvu
 >12	string	THUM		DjVu page thumbnails
+!:mime	image/vnd.djvu
 
 
 # From Marc Espie

+ 2 - 1
magic/Magdir/inform

@@ -1,8 +1,9 @@
 
 #------------------------------------------------------------------------------
+# $File: inform,v 1.5 2009/09/19 16:28:09 christos Exp $
 # inform:  file(1) magic for Inform interactive fiction language
 
 # URL:  http://www.inform-fiction.org/
 # From: Reuben Thomas <rrt@sc3d.org>
 
-0	search/cB/100	constant\ story		Inform source text
+0	search/100/cW	constant\ story		Inform source text

+ 1 - 0
magic/Magdir/intel

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: intel,v 1.8 2009/09/19 16:28:10 christos Exp $
 # intel:  file(1) magic for x86 Unix
 #
 # Various flavors of x86 UNIX executable/object (other than Xenix, which

+ 1 - 0
magic/Magdir/interleaf

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: interleaf,v 1.10 2009/09/19 16:28:10 christos Exp $
 # interleaf:  file(1) magic for InterLeaf TPS:
 #
 0	string		=\210OPS	Interleaf saved data

+ 1 - 0
magic/Magdir/island

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: island,v 1.5 2009/09/19 16:28:10 christos Exp $
 # island:  file(1) magic for IslandWite/IslandDraw, from SunOS 5.5.1
 # "/etc/magic":
 # From: guy@netapp.com (Guy Harris)

+ 1 - 0
magic/Magdir/ispell

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: ispell,v 1.8 2009/09/19 16:28:10 christos Exp $
 # ispell:  file(1) magic for ispell
 #
 # Ispell 3.0 has a magic of 0x9601 and ispell 3.1 has 0x9602.  This magic

+ 2 - 0
magic/Magdir/java

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------
+# $File: java,v 1.12 2009/09/19 16:28:10 christos Exp $
 # Java ByteCode and Mach-O binaries (e.g., Mac OS X) use the
 # same magic number, 0xcafebabe, so they are both handled
 # in the entry called "cafebabe".

+ 1 - 0
magic/Magdir/jpeg

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: jpeg,v 1.15 2009/09/19 16:28:10 christos Exp $
 # JPEG images
 # SunOS 5.5.1 had
 #

+ 1 - 0
magic/Magdir/karma

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: karma,v 1.6 2009/09/19 16:28:10 christos Exp $
 # karma:  file(1) magic for Karma data files
 #
 # From <rgooch@atnf.csiro.au>

+ 1 - 0
magic/Magdir/kde

@@ -1,5 +1,6 @@
 
 #------------------------------------------------------------------------------
+# $File: kde,v 1.4 2009/09/19 16:28:10 christos Exp $
 # kde:  file(1) magic for KDE
 
 0		string	[KDE\ Desktop\ Entry]	KDE desktop entry

+ 2 - 0
magic/Magdir/kml

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: kml,v 1.2 2009/09/19 16:28:10 christos Exp $
 # Type: Google KML, formerly Keyhole Markup Language
 # Future development of this format has been handed
 # over to the Open Geospatial Consortium.

+ 2 - 0
magic/Magdir/lecter

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: lecter,v 1.4 2009/09/19 16:28:10 christos Exp $
 # DEC SRC Virtual Paper: Lectern files
 # Karl M. Hegbloom <karlheg@inetarena.com>
 0	string	lect	DEC SRC Virtual Paper Lectern file

+ 2 - 0
magic/Magdir/lex

@@ -1,4 +1,6 @@
+
 #------------------------------------------------------------------------------
+# $File: lex,v 1.6 2009/09/19 16:28:10 christos Exp $
 # lex:  file(1) magic for lex
 #
 #	derived empirically, your offsets may vary!

+ 0 - 0
magic/Magdir/lif


Some files were not shown because too many files changed in this diff