Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/file/dist 2017-02-10 12:24 Christos Zoulas <c...
details: https://anonhg.NetBSD.org/src/rev/0ef47732cd40
branches: trunk
changeset: 821602:0ef47732cd40
user: christos <christos%NetBSD.org@localhost>
date: Fri Feb 10 17:42:56 2017 +0000
description:
2017-02-10 12:24 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.30
2017-02-07 23:27 Christos Zoulas <christos%zoulas.com@localhost>
* If we exceeded the offset in a search return no match
(Christoph Biedl)
* Be more lenient on corrupt CDF files (Christoph Biedl)
2017-02-04 16:46 Christos Zoulas <christos%zoulas.com@localhost>
* pacify ubsan sign extension (oss-fuzz/524)
2017-02-01 12:42 Christos Zoulas <christos%zoulas.com@localhost>
* off by one in cdf parsing (PR/593)
* report debugging sections in elf (PR/591)
2016-11-06 10:52 Christos Zoulas <christos%zoulas.com@localhost>
* Allow @@@ in extensions
* Add missing overflow check in der magic (Jonas Wagner)
2016-10-25 10:40 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.29
2016-10-24 11:20 Christos Zoulas <christos%zoulas.com@localhost>
* der getlength overflow (Jonas Wagner)
* multiple magic file load failure (Christoph Biedl)
2016-10-17 11:26 Christos Zoulas <christos%zoulas.com@localhost>
* CDF parsing improvements (Guy Helmer)
2016-07-20 7:26 Christos Zoulas <christos%zoulas.com@localhost>
* Add support for signed indirect offsets
2016-07-18 7:41 Christos Zoulas <christos%zoulas.com@localhost>
* cat /dev/null | file - should print empty (Christoph Biedl)
2016-07-05 15:20 Christos Zoulas <christos%zoulas.com@localhost>
* Bump string size from 64 to 96.
2016-06-13 20:20 Christos Zoulas <christos%zoulas.com@localhost>
* PR/556: Fix separators on annotations.
2016-06-13 19:40 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.28
* fix leak on allocation failure
2016-06-01 1:20 Christos Zoulas <christos%zoulas.com@localhost>
* PR/555: Avoid overflow for offset > nbytes
* PR/550: Segv on DER parsing:
- use the correct variable for length
- set offset to 0 on failure.
2016-05-13 12:00 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.27
2016-04-18 9:35 Christos Zoulas <christos%zoulas.com@localhost>
* Errors comparing DER entries or computing offsets
are just indications of malformed non-DER files.
Don't print them.
* Offset comparison was off-by-one.
* Fix compression code (Werner Fink)
* Put new bytes constant in the right file (not the generated one)
2016-04-16 18:34 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.26
2016-03-31 13:50 Christos Zoulas <christos%zoulas.com@localhost>
* make the number of bytes read from files configurable.
2016-03-21 13:40 Christos Zoulas <christos%zoulas.com@localhost>
* Add bounds checks for DER code (discovered by Thomas Jarosch)
* Change indirect recursion limit to indirect use count and
bump from 15 to 50 to prevent abuse.
2016-03-13 20:39 Christos Zoulas <christos%zoulas.com@localhost>
* Add -00 which prints filename\0description\0
2016-03-01 13:28 Christos Zoulas <christos%zoulas.com@localhost>
* Fix ID3 indirect parsing
2016-01-19 10:18 Christos Zoulas <christos%zoulas.com@localhost>
* add DER parsing capability
2015-11-13 10:35 Christos Zoulas <christos%zoulas.com@localhost>
* provide dprintf(3) for the OS's that don't have it.
2015-11-11 16:25 Christos Zoulas <christos%zoulas.com@localhost>
* redo the compression code report decompression errors
2015-11-10 23:25 Christos Zoulas <christos%zoulas.com@localhost>
* REG_STARTEND code is not working as expected, delete it.
2015-11-09 16:05 Christos Zoulas <christos%zoulas.com@localhost>
* Add zlib support if we have it.
2015-11-05 11:22 Christos Zoulas <christos%zoulas.com@localhost>
* PR/492: compression forking was broken with magic_buffer.
2015-09-16 9:50 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.25
2015-09-11 13:25 Christos Zoulas <christos%zoulas.com@localhost>
* add a limit to the length of regex searches
2015-09-08 9:50 Christos Zoulas <christos%zoulas.com@localhost>
* fix problems with --parameter (Christoph Biedl)
2015-07-11 10:35 Christos Zoulas <christos%zoulas.com@localhost>
* Windows fixes PR/466 (Jason Hood)
2015-07-09 10:35 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.24
2015-06-11 8:52 Christos Zoulas <christos%zoulas.com@localhost>
* redo long option encoding to fix off-by-one in 5.23
2015-06-10 13:50 Christos Zoulas <christos%zoulas.com@localhost>
* release 5.23
2015-06-09 16:10 Christos Zoulas <christos%zoulas.com@localhost>
* Fix issue with regex range for magic with offset
* Always return true from mget with USE (success to mget not match
indication). Fixes mime evaluation after USE magic
* PR/459: Don't insert magic entries to the list if there are parsing
errors for them.
2015-06-03 16:00 Christos Zoulas <christos%zoulas.com@localhost>
* PR/455: Add utf-7 encoding
2015-06-03 14:30 Christos Zoulas <christos%zoulas.com@localhost>
* PR/455: Implement -Z, look inside, but don't report on compression
* PR/454: Fix allocation error on bad magic.
2015-05-29 10:30 Christos Zoulas <christos%zoulas.com@localhost>
* handle MAGIC_CONTINUE everywhere, not just in softmagic
2015-05-21 14:30 Christos Zoulas <christos%zoulas.com@localhost>
* don't print descriptions for NAME types when mime.
2015-04-09 15:59 Christos Zoulas <christos%zoulas.com@localhost>
* Add --extension to list the known extensions for this file type
Idea by Andrew J Roazen
2015-02-14 12:23 Christos Zoulas <christos%zoulas.com@localhost>
* Bump file search buffer size to 1M.
2015-01-09 14:35 Christos Zoulas <christos%zoulas.com@localhost>
* Fix multiple issues with date formats reported by Christoph Biedl:
- T_LOCAL meaning was reversed
- Arithmetic did not work
Also stop adjusting daylight savings for gmt printing.
2015-01-05 13:00 Christos Zoulas <christos%zoulas.com@localhost>
* PR/411: Fix memory corruption from corrupt cdf file.
diffstat:
external/bsd/file/dist/README | 39 +-
external/bsd/file/dist/TODO | 21 +-
external/bsd/file/dist/ltmain.sh | 9 +-
external/bsd/file/dist/magic/magdir/adventure | 33 +-
external/bsd/file/dist/magic/magdir/algol68 | 19 +
external/bsd/file/dist/magic/magdir/android | 10 +-
external/bsd/file/dist/magic/magdir/animation | 22 +-
external/bsd/file/dist/magic/magdir/application | 7 +
external/bsd/file/dist/magic/magdir/apt | 52 +
external/bsd/file/dist/magic/magdir/audio | 64 +-
external/bsd/file/dist/magic/magdir/ber | 65 +
external/bsd/file/dist/magic/magdir/bioinformatics | 178 +++++
external/bsd/file/dist/magic/magdir/c-lang | 22 +-
external/bsd/file/dist/magic/magdir/c64 | 8 +-
external/bsd/file/dist/magic/magdir/cafebabe | 15 +-
external/bsd/file/dist/magic/magdir/cbor | 21 +
external/bsd/file/dist/magic/magdir/claris | 5 +-
external/bsd/file/dist/magic/magdir/coff | 77 ++
external/bsd/file/dist/magic/magdir/commands | 14 +-
external/bsd/file/dist/magic/magdir/compress | 61 +-
external/bsd/file/dist/magic/magdir/console | 740 ++++++++++++++++++--
external/bsd/file/dist/magic/magdir/coverage | 91 ++
external/bsd/file/dist/magic/magdir/cups | 4 +-
external/bsd/file/dist/magic/magdir/database | 89 ++-
external/bsd/file/dist/magic/magdir/der | 116 +++
external/bsd/file/dist/magic/magdir/dyadic | 7 +-
external/bsd/file/dist/magic/magdir/editors | 27 +-
external/bsd/file/dist/magic/magdir/finger | 16 +
external/bsd/file/dist/magic/magdir/flash | 52 +-
external/bsd/file/dist/magic/magdir/flif | 36 +
external/bsd/file/dist/magic/magdir/fonts | 111 ++-
external/bsd/file/dist/magic/magdir/fortran | 6 +-
external/bsd/file/dist/magic/magdir/frame | 6 +-
external/bsd/file/dist/magic/magdir/gcc | 6 +-
external/bsd/file/dist/magic/magdir/gnu | 13 +-
external/bsd/file/dist/magic/magdir/gpu | 16 +
external/bsd/file/dist/magic/magdir/hitachi-sh | 32 +-
external/bsd/file/dist/magic/magdir/icc | 187 ++++-
external/bsd/file/dist/magic/magdir/iff | 4 +-
external/bsd/file/dist/magic/magdir/images | 456 +++++++++++-
external/bsd/file/dist/magic/magdir/intel | 20 +-
external/bsd/file/dist/magic/magdir/java | 11 +-
external/bsd/file/dist/magic/magdir/karma | 4 +-
external/bsd/file/dist/magic/magdir/linux | 46 +-
external/bsd/file/dist/magic/magdir/lisp | 31 +-
external/bsd/file/dist/magic/magdir/mach | 59 +-
external/bsd/file/dist/magic/magdir/macintosh | 9 +-
external/bsd/file/dist/magic/magdir/mail.news | 3 +-
external/bsd/file/dist/magic/magdir/make | 28 +-
external/bsd/file/dist/magic/magdir/map | 22 +-
external/bsd/file/dist/magic/magdir/mathematica | 13 +-
external/bsd/file/dist/magic/magdir/microfocus | 21 +
external/bsd/file/dist/magic/magdir/misctools | 43 +-
external/bsd/file/dist/magic/magdir/modem | 57 +-
external/bsd/file/dist/magic/magdir/mozilla | 3 +-
external/bsd/file/dist/magic/magdir/msdos | 464 ++++++++++--
external/bsd/file/dist/magic/magdir/msvc | 33 +-
external/bsd/file/dist/magic/magdir/msx | 220 +++--
external/bsd/file/dist/magic/magdir/nasa | 7 +
external/bsd/file/dist/magic/magdir/netscape | 5 +-
external/bsd/file/dist/magic/magdir/os2 | 7 +-
external/bsd/file/dist/magic/magdir/pbf | 8 +-
external/bsd/file/dist/magic/magdir/pc88 | 24 +
external/bsd/file/dist/magic/magdir/pc98 | 77 ++
external/bsd/file/dist/magic/magdir/pdf | 7 +-
external/bsd/file/dist/magic/magdir/perl | 48 +-
external/bsd/file/dist/magic/magdir/polyml | 23 +
external/bsd/file/dist/magic/magdir/psdbms | 14 +-
external/bsd/file/dist/magic/magdir/psl | 14 +
external/bsd/file/dist/magic/magdir/python | 11 +-
external/bsd/file/dist/magic/magdir/riff | 3 +-
external/bsd/file/dist/magic/magdir/ruby | 6 +-
external/bsd/file/dist/magic/magdir/scientific | 7 +-
external/bsd/file/dist/magic/magdir/sendmail | 27 +-
external/bsd/file/dist/magic/magdir/sereal | 24 +-
external/bsd/file/dist/magic/magdir/sgi | 6 +-
external/bsd/file/dist/magic/magdir/sgml | 68 +-
external/bsd/file/dist/magic/magdir/sinclair | 23 +-
external/bsd/file/dist/magic/magdir/sql | 102 ++-
external/bsd/file/dist/magic/magdir/ssl | 22 +-
external/bsd/file/dist/magic/magdir/terminfo | 18 +-
external/bsd/file/dist/magic/magdir/vacuum-cleaner | 54 +
external/bsd/file/dist/magic/magdir/varied.script | 10 +-
external/bsd/file/dist/magic/magdir/vorbis | 28 +-
external/bsd/file/dist/magic/magdir/windows | 246 ++++++-
external/bsd/file/dist/magic/magdir/wordprocessors | 274 +++++--
external/bsd/file/dist/magic/magdir/x68000 | 25 +
external/bsd/file/dist/magic/magdir/xenix | 23 +-
external/bsd/file/dist/magic/magdir/yara | 17 +
external/bsd/file/dist/python/README | 13 -
external/bsd/file/dist/python/magic.py | 90 ++-
external/bsd/file/dist/python/setup.py | 30 +-
external/bsd/file/dist/src/Makefile.am | 4 +-
external/bsd/file/dist/src/ascmagic.c | 24 +-
external/bsd/file/dist/src/cdf.h | 20 +-
external/bsd/file/dist/src/der.c | 410 +++++++++++
external/bsd/file/dist/src/der.h | 30 +
external/bsd/file/dist/src/dprintf.c | 64 +
external/bsd/file/dist/src/file_opts.h | 56 +-
external/bsd/file/dist/src/fmtcheck.c | 19 +-
external/bsd/file/dist/src/gmtime_r.c | 25 +
external/bsd/file/dist/src/is_tar.c | 8 +-
external/bsd/file/dist/src/localtime_r.c | 25 +
external/bsd/file/dist/src/magic.h.in | 51 +-
external/bsd/file/dist/src/readelf.h | 38 +-
external/bsd/file/dist/tests/Makefile.am | 2 +-
106 files changed, 5156 insertions(+), 825 deletions(-)
diffs (truncated from 8176 to 300 lines):
diff -r d47d8706b1ca -r 0ef47732cd40 external/bsd/file/dist/README
--- a/external/bsd/file/dist/README Fri Feb 10 16:53:51 2017 +0000
+++ b/external/bsd/file/dist/README Fri Feb 10 17:42:56 2017 +0000
@@ -1,6 +1,6 @@
## README for file(1) Command ##
- @(#) $File: README,v 1.49 2015/01/02 20:23:04 christos Exp $
+ @(#) $File: README,v 1.50 2016/04/16 22:40:54 christos Exp $
Mailing List: file%mx.gw.com@localhost
Mailing List archives: http://mx.gw.com/pipermail/file/
@@ -67,17 +67,41 @@
COPYING - read this first.
README - read this second (you are currently reading this file).
INSTALL - read on how to install
+src/localtime_r.c
+src/magic.c
+src/magic.h
+src/mygetopt.h
+src/newtest2.c
+src/newtest3.c
+src/pread.c
+src/print.c
+src/readcdf.c
+src/readelf.c
+src/readelf.h
+src/regex.c
+src/regex2.c
+src/softmagic.c
+src/strcasestr.c
+src/strlcat.c
+src/strlcpy.c
+src/strndup.c
+src/tar.h
+src/teststrchr.c
+src/vasprintf.c
+src/x.c
src/apprentice.c - parses /etc/magic to learn magic
-src/asctime_r.c - replacement for OS's that don't have it.
src/apptype.c - used for OS/2 specific application type magic
+src/ascmagic.c - third & last set of tests, based on hardwired assumptions.
+src/asctime_r.c - replacement for OS's that don't have it.
src/asprintf.c - replacement for OS's that don't have it.
-src/ascmagic.c - third & last set of tests, based on hardwired assumptions.
src/asctime_r.c - replacement for OS's that don't have it.
src/asprintf.c - replacement for OS's that don't have it.
src/cdf.[ch] - parser for Microsoft Compound Document Files
src/cdf_time.c - time converter for CDF.
src/compress.c - handles decompressing files to look inside.
src/ctime_r.c - replacement for OS's that don't have it.
+src/der.[ch] - parser for Distinguished Encoding Rules
+src/dprintf.c - replacement for OS's that don't have it.
src/elfclass.h - common code for elf 32/64.
src/encoding.c - handles unicode encodings
src/file.c - the main program
@@ -88,10 +112,13 @@
src/funcs.c - utilility functions
src/getline.c - replacement for OS's that don't have it.
src/getopt_long.c - replacement for OS's that don't have it.
-src/is_tar.c, tar.h - knows about tarchives (courtesy John Gilmore).
+src/gmtime_r.c - replacement for OS's that don't have it.
+src/is_tar.c, tar.h - knows about Tape ARchive format (courtesy John Gilmore).
+src/localtime_r.c - replacement for OS's that don't have it.
+src/magic.h.in - source file for magic.h
+src/mygetopt.h - replacement for OS's that don't have it.
+src/magic.c - the libmagic api
src/names.h - header file for ascmagic.c
-src/magic.h.in - source file for magic.h
-src/magic.c - the libmagic api
src/pread.c - replacement for OS's that don't have it.
src/print.c - print results, errors, warnings.
src/readcdf.c - CDF wrapper.
diff -r d47d8706b1ca -r 0ef47732cd40 external/bsd/file/dist/TODO
--- a/external/bsd/file/dist/TODO Fri Feb 10 16:53:51 2017 +0000
+++ b/external/bsd/file/dist/TODO Fri Feb 10 17:42:56 2017 +0000
@@ -6,7 +6,6 @@
listed in the BUGS section of the man page had been fixed!)
---
-
It would be nice to simplify file considerably. For example,
reimplement the apprentice and non-pattern magic methods in Python,
and compile the magic patterns to a giant regex (or something similar;
@@ -15,5 +14,23 @@
required for soft magic, not the more detailed information given by
hard-wired routines). In this regard, note that hplip, which is
BSD-licensed, has a magic reimplementation in Python.
+---
+Read the kerberos magic entry for more ideas.
+---
+Write a string merger to make magic entry sizes dynamic.
+Strings will be converted to offsets from the string table.
+---
+Programming language support, we can introduce the concept of a group
+of rules where n rules need to match before the rule is positive. This
+could require structural changes to the matching code :-(
-Read the kerberos magic entry for more ideas.
+0 group 2 # require 2 matches
+# rule 1
+>0 ....
+...
+# rule 2
+>0 ....
+...
+
+christos
+
diff -r d47d8706b1ca -r 0ef47732cd40 external/bsd/file/dist/ltmain.sh
--- a/external/bsd/file/dist/ltmain.sh Fri Feb 10 16:53:51 2017 +0000
+++ b/external/bsd/file/dist/ltmain.sh Fri Feb 10 17:42:56 2017 +0000
@@ -6900,7 +6900,11 @@
# Finalize command for both is simple: just hardcode it.
if test "$hardcode_direct" = yes &&
test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
+ if test -f "$inst_prefix_dir$libdir/$linklib"; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+ fi
elif test "$hardcode_minus_L" = yes; then
add_dir="-L$libdir"
add="-l$name"
@@ -9428,7 +9432,8 @@
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test "$installed" = no && test "$need_relink" = yes && \
+ test -n "$relink_command"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
diff -r d47d8706b1ca -r 0ef47732cd40 external/bsd/file/dist/magic/magdir/adventure
--- a/external/bsd/file/dist/magic/magdir/adventure Fri Feb 10 16:53:51 2017 +0000
+++ b/external/bsd/file/dist/magic/magdir/adventure Fri Feb 10 17:42:56 2017 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: adventure,v 1.14 2012/06/21 01:32:26 christos Exp $
+# $File: adventure,v 1.15 2015/09/07 10:03:21 christos Exp $
# adventure: file(1) magic for Adventure game files
#
# from Allen Garvin <earendil%faeryland.tamu-commerce.edu@localhost>
@@ -17,6 +17,7 @@
# Infocom (see z-machine)
#------------------------------------------------------------------------------
# Z-machine: file(1) magic for Z-machine binaries.
+# Sanity checks by David Griffith <dave%661.org@localhost>
# Updated by Adam Buchbinder <adam.buchbinder%gmail.com@localhost>
#
#http://www.gnelson.demon.co.uk/zspec/sect11.html
@@ -41,10 +42,12 @@
>>>>>>>2 ubeshort < 10 Release %d /
>>>>>>>>18 string >\0 Serial %.6s)
!:strength + 40
+!:mime application/x-zmachine
#------------------------------------------------------------------------------
# Glulx: file(1) magic for Glulx binaries.
#
+# David Griffith <dave%661.org@localhost>
# I haven't checked for false matches yet.
#
0 string Glul Glulx game data
@@ -52,7 +55,7 @@
>>6 byte x \b.%d
>>8 byte x \b.%d)
>36 string Info Compiled by Inform
-
+!:mime application/x-glulx
# For Quetzal and blorb magic see iff
@@ -66,11 +69,13 @@
>9 belong !0x0A0D1A00 game data, CORRUPTED
>9 belong 0x0A0D1A00
>>13 string >\0 %s game data
+!:mime application/x-tads
# Resource files start with "TADS2 rsc\n\r\032\0" then the compiler version.
0 string TADS2\ rsc TADS
>9 belong !0x0A0D1A00 resource data, CORRUPTED
>9 belong 0x0A0D1A00
>>13 string >\0 %s resource data
+!:mime application/x-tads
# Some saved game files start with "TADS2 save/g\n\r\032\0", a little-endian
# 2-byte length N, the N-char name of the game file *without* a NUL (darn!),
# "TADS2 save\n\r\032\0" and the interpreter version.
@@ -78,12 +83,14 @@
>12 belong !0x0A0D1A00 saved game data, CORRUPTED
>12 belong 0x0A0D1A00
>>(16.s+32) string >\0 %s saved game data
+!:mime application/x-tads
# Other saved game files start with "TADS2 save\n\r\032\0" and the interpreter
# version.
0 string TADS2\ save TADS
>10 belong !0x0A0D1A00 saved game data, CORRUPTED
>10 belong 0x0A0D1A00
>>14 string >\0 %s saved game data
+!:mime application/x-tads
# TADS (Text Adventure Development System) version 3
# Game files start with "T3-image\015\012\032"
@@ -97,14 +104,18 @@
>>11 byte x \b%c
>>12 byte x \b%c
>>13 byte x \b%c)
+!:mime application/x-t3vm-image
+# edited by David Griffith <dave%661.org@localhost>
# Danny Milosavljevic <danny.milo%gmx.net@localhost>
-# this are adrift (adventure game standard) game files, extension .taf
-# depending on version magic continues with 0x93453E6139FA (V 4.0)
-# 0x9445376139FA (V 3.90)
-# 0x9445366139FA (V 3.80)
-# this is from source (http://www.adrift.org.uk/) and I have some taf
-# files, and checked them.
-#0 belong 0x3C423FC9
-#>4 belong 0x6A87C2CF Adrift game file
-#!:mime application/x-adrift
+# These are ADRIFT (adventure game standard) game files, extension .taf
+# Checked from source at (http://www.adrift.co/) and various taf files
+# found at the Interactive Fiction Archive (http://ifarchive.org/)
+0 belong 0x3C423FC9
+>4 belong 0x6A87C2CF Adrift game file version
+>>8 belong 0x94453661 3.80
+>>8 belong 0x94453761 3.90
+>>8 belong 0x93453E61 4.0
+>>8 belong 0x92453E61 5.0
+>>8 default x unknown
+!:mime application/x-adrift
diff -r d47d8706b1ca -r 0ef47732cd40 external/bsd/file/dist/magic/magdir/algol68
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/bsd/file/dist/magic/magdir/algol68 Fri Feb 10 17:42:56 2017 +0000
@@ -0,0 +1,19 @@
+
+#------------------------------------------------------------------------------
+# $File: algol68,v 1.2 2016/10/17 14:17:48 christos Exp $
+# algol68: file(1) magic for Algol 68 source
+#
+0 search/8192 (input, Algol 68 source text
+!:mime text/x-Algol68
+0 regex \^PROC Algol 68 source text
+!:mime text/x-Algol68
+0 regex MODE[\t\ ] Algol 68 source text
+!:mime text/x-Algol68
+0 regex REF[\t\ ] Algol 68 source text
+!:mime text/x-Algol68
+0 regex FLEX[\t\ ]\*\\[ Algol 68 source text
+!:mime text/x-Algol68
+#0 regex [\t\ ]OD Algol 68 source text
+#!:mime text/x-Algol68
+#0 regex [\t\ ]FI Algol 68 source text
+#!:mime text/x-Algol68
diff -r d47d8706b1ca -r 0ef47732cd40 external/bsd/file/dist/magic/magdir/android
--- a/external/bsd/file/dist/magic/magdir/android Fri Feb 10 16:53:51 2017 +0000
+++ b/external/bsd/file/dist/magic/magdir/android Fri Feb 10 17:42:56 2017 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------
-# $File: android,v 1.7 2014/11/10 05:08:23 christos Exp $
+# $File: android,v 1.9 2016/01/11 21:19:18 christos Exp $
# Various android related magic entries
#------------------------------------------------------------
@@ -128,7 +128,7 @@
# partition size in blocks ?
#>>>>0x22 ulelong x \b*%d
-# Android bootimg format
+# Android sparse img format
# From https://android.googlesource.com/\
# platform/system/core/+/master/libsparse/sparse_format.h
0 lelong 0xed26ff3a Android sparse image
@@ -137,3 +137,9 @@
>16 lelong x \b, Total of %d
>12 lelong x \b %d-byte output blocks in
>20 lelong x \b %d input chunks.
+
+# Android binary XML magic
+# In include/androidfw/ResourceTypes.h:
+# RES_XML_TYPE = 0x0003 followed by the size of the header (ResXMLTree_header),
+# which is 8 bytes (2 bytes type + 2 bytes header size + 4 bytes size).
+0 lelong 0x00080003 Android binary XML
diff -r d47d8706b1ca -r 0ef47732cd40 external/bsd/file/dist/magic/magdir/animation
--- a/external/bsd/file/dist/magic/magdir/animation Fri Feb 10 16:53:51 2017 +0000
+++ b/external/bsd/file/dist/magic/magdir/animation Fri Feb 10 17:42:56 2017 +0000
@@ -1,6 +1,6 @@
#------------------------------------------------------------------------------
-# $File: animation,v 1.56 2014/10/23 23:12:51 christos Exp $
+# $File: animation,v 1.59 2017/01/21 16:07:14 christos Exp $
# animation: file(1) magic for animation/movie formats
#
# animation formats
@@ -76,6 +76,8 @@
>8 string da2b \b, DMB MAF, ext da2a, with 3GPP timed text, DID, TVA, REL, IPMP
>8 string da3a \b, DMB MAF aud with HE-AAC aud, JPG/PNG/MNG images
>8 string da3b \b, DMB MAF, ext da3a w/ BIFS, 3GPP, DID, TVA, REL, IPMP
Home |
Main Index |
Thread Index |
Old Index