PERFORCE change 133293 for review
Peter Wemm
peter at FreeBSD.org
Mon Jan 14 16:31:27 PST 2008
http://perforce.freebsd.org/chv.cgi?CH=133293
Change 133293 by peter at peter_overcee on 2008/01/15 00:30:28
IFC @133288
Affected files ...
.. //depot/projects/hammer/contrib/file/ChangeLog#5 integrate
.. //depot/projects/hammer/contrib/file/Magdir/acorn#2 integrate
.. //depot/projects/hammer/contrib/file/Magdir/animation#7 integrate
.. //depot/projects/hammer/contrib/file/Magdir/apple#4 integrate
.. //depot/projects/hammer/contrib/file/Magdir/archive#8 integrate
.. //depot/projects/hammer/contrib/file/Magdir/audio#8 integrate
.. //depot/projects/hammer/contrib/file/Magdir/blender#2 integrate
.. //depot/projects/hammer/contrib/file/Magdir/commands#6 integrate
.. //depot/projects/hammer/contrib/file/Magdir/console#6 integrate
.. //depot/projects/hammer/contrib/file/Magdir/database#6 integrate
.. //depot/projects/hammer/contrib/file/Magdir/efi#1 branch
.. //depot/projects/hammer/contrib/file/Magdir/elf#8 integrate
.. //depot/projects/hammer/contrib/file/Magdir/filesystems#8 integrate
.. //depot/projects/hammer/contrib/file/Magdir/fortran#1 branch
.. //depot/projects/hammer/contrib/file/Magdir/java#4 integrate
.. //depot/projects/hammer/contrib/file/Magdir/macintosh#5 integrate
.. //depot/projects/hammer/contrib/file/Magdir/msdos#7 integrate
.. //depot/projects/hammer/contrib/file/Magdir/pdf#2 integrate
.. //depot/projects/hammer/contrib/file/Magdir/sgi#4 integrate
.. //depot/projects/hammer/contrib/file/Makefile.am#8 integrate
.. //depot/projects/hammer/contrib/file/Makefile.in#8 integrate
.. //depot/projects/hammer/contrib/file/acinclude.m4#4 integrate
.. //depot/projects/hammer/contrib/file/aclocal.m4#7 integrate
.. //depot/projects/hammer/contrib/file/apprentice.c#8 integrate
.. //depot/projects/hammer/contrib/file/ascmagic.c#8 integrate
.. //depot/projects/hammer/contrib/file/compress.c#7 integrate
.. //depot/projects/hammer/contrib/file/config.h.in#8 integrate
.. //depot/projects/hammer/contrib/file/configure#8 integrate
.. //depot/projects/hammer/contrib/file/configure.in#8 integrate
.. //depot/projects/hammer/contrib/file/file.c#8 integrate
.. //depot/projects/hammer/contrib/file/file.h#8 integrate
.. //depot/projects/hammer/contrib/file/file.man#6 integrate
.. //depot/projects/hammer/contrib/file/file_opts.h#1 branch
.. //depot/projects/hammer/contrib/file/fsmagic.c#7 integrate
.. //depot/projects/hammer/contrib/file/funcs.c#5 integrate
.. //depot/projects/hammer/contrib/file/install-sh#4 integrate
.. //depot/projects/hammer/contrib/file/is_tar.c#6 integrate
.. //depot/projects/hammer/contrib/file/libmagic.man#3 integrate
.. //depot/projects/hammer/contrib/file/magic.c#5 integrate
.. //depot/projects/hammer/contrib/file/magic.h#4 integrate
.. //depot/projects/hammer/contrib/file/magic.man#6 integrate
.. //depot/projects/hammer/contrib/file/magic.mime#8 integrate
.. //depot/projects/hammer/contrib/file/mkinstalldirs#4 integrate
.. //depot/projects/hammer/contrib/file/names.h#6 integrate
.. //depot/projects/hammer/contrib/file/patchlevel.h#8 integrate
.. //depot/projects/hammer/contrib/file/print.c#8 integrate
.. //depot/projects/hammer/contrib/file/readelf.c#9 integrate
.. //depot/projects/hammer/contrib/file/readelf.h#6 integrate
.. //depot/projects/hammer/contrib/file/softmagic.c#8 integrate
.. //depot/projects/hammer/crypto/openssl/crypto/engine/eng_cryptodev.c#2 integrate
.. //depot/projects/hammer/etc/rc.d/jail#23 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/Makefile#3 integrate
.. //depot/projects/hammer/gnu/usr.bin/cvs/contrib/Makefile#3 integrate
.. //depot/projects/hammer/lib/libarchive/archive_read_support_format_tar.c#39 integrate
.. //depot/projects/hammer/lib/libarchive/test/test_read_format_tar.c#3 integrate
.. //depot/projects/hammer/lib/libc/inet/inet_network.c#4 integrate
.. //depot/projects/hammer/lib/libc/stdlib/grantpt.c#8 integrate
.. //depot/projects/hammer/lib/libc/stdlib/qsort.c#5 integrate
.. //depot/projects/hammer/lib/libmagic/config.h#5 integrate
.. //depot/projects/hammer/lib/libutil/pty.c#8 integrate
.. //depot/projects/hammer/lib/msun/Makefile#37 integrate
.. //depot/projects/hammer/lib/msun/Symbol.map#7 integrate
.. //depot/projects/hammer/lib/msun/amd64/Makefile.inc#7 integrate
.. //depot/projects/hammer/lib/msun/amd64/s_llrintl.S#1 branch
.. //depot/projects/hammer/lib/msun/amd64/s_lrintl.S#1 branch
.. //depot/projects/hammer/lib/msun/amd64/s_rintl.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/Makefile.inc#9 integrate
.. //depot/projects/hammer/lib/msun/i387/s_llrintl.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_lrintl.S#1 branch
.. //depot/projects/hammer/lib/msun/i387/s_rintl.S#1 branch
.. //depot/projects/hammer/lib/msun/man/lrint.3#2 integrate
.. //depot/projects/hammer/lib/msun/man/rint.3#5 integrate
.. //depot/projects/hammer/lib/msun/src/math.h#33 integrate
.. //depot/projects/hammer/lib/msun/src/s_llrintl.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_lrintl.c#1 branch
.. //depot/projects/hammer/lib/msun/src/s_nearbyint.c#2 integrate
.. //depot/projects/hammer/lib/msun/src/s_rint.c#5 integrate
.. //depot/projects/hammer/lib/msun/src/s_rintl.c#1 branch
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#172 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_file.c#27 integrate
.. //depot/projects/hammer/sys/compat/linux/linux_misc.c#44 integrate
.. //depot/projects/hammer/sys/compat/ndis/subr_ndis.c#44 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_kobj.c#5 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/kern/opensolaris_vfs.c#6 integrate
.. //depot/projects/hammer/sys/compat/opensolaris/sys/vnode.h#5 integrate
.. //depot/projects/hammer/sys/compat/pecoff/imgact_pecoff.c#18 integrate
.. //depot/projects/hammer/sys/compat/svr4/imgact_svr4.c#11 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_fcntl.c#14 integrate
.. //depot/projects/hammer/sys/compat/svr4/svr4_misc.c#31 integrate
.. //depot/projects/hammer/sys/conf/files#172 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#4 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate
.. //depot/projects/hammer/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#14 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#14 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#2 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#8 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#15 integrate
.. //depot/projects/hammer/sys/dev/cxgb/sys/uipc_mvec.c#6 integrate
.. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#22 integrate
.. //depot/projects/hammer/sys/dev/md/md.c#64 integrate
.. //depot/projects/hammer/sys/dev/stge/if_stge.c#6 integrate
.. //depot/projects/hammer/sys/dev/stge/if_stgereg.h#3 integrate
.. //depot/projects/hammer/sys/fs/cd9660/cd9660_lookup.c#4 integrate
.. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#5 integrate
.. //depot/projects/hammer/sys/fs/coda/coda_vnops.c#4 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_devs.c#20 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vfsops.c#22 integrate
.. //depot/projects/hammer/sys/fs/devfs/devfs_vnops.c#56 integrate
.. //depot/projects/hammer/sys/fs/fdescfs/fdesc_vnops.c#21 integrate
.. //depot/projects/hammer/sys/fs/fifofs/fifo_vnops.c#42 integrate
.. //depot/projects/hammer/sys/fs/hpfs/hpfs_vfsops.c#26 integrate
.. //depot/projects/hammer/sys/fs/hpfs/hpfs_vnops.c#25 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_lookup.c#15 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vfsops.c#50 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#35 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vfsops.c#35 integrate
.. //depot/projects/hammer/sys/fs/ntfs/ntfs_vnops.c#23 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_vfsops.c#27 integrate
.. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#29 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_vfsops.c#20 integrate
.. //depot/projects/hammer/sys/fs/nwfs/nwfs_vnops.c#17 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs.c#11 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vncache.c#18 integrate
.. //depot/projects/hammer/sys/fs/pseudofs/pseudofs_vnops.c#27 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vfsops.c#26 integrate
.. //depot/projects/hammer/sys/fs/smbfs/smbfs_vnops.c#30 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vfsops.c#12 integrate
.. //depot/projects/hammer/sys/fs/tmpfs/tmpfs_vnops.c#9 integrate
.. //depot/projects/hammer/sys/fs/udf/udf_vfsops.c#32 integrate
.. //depot/projects/hammer/sys/fs/udf/udf_vnops.c#39 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#27 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#24 integrate
.. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#35 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_lookup.c#6 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vfsops.c#16 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/ext2_vnops.c#10 integrate
.. //depot/projects/hammer/sys/gnu/fs/ext2fs/fs.h#4 integrate
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_inode.c#4 integrate
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_namei.c#6 integrate
.. //depot/projects/hammer/sys/gnu/fs/reiserfs/reiserfs_vfsops.c#9 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_mountops.c#8 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_super.c#5 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.c#4 integrate
.. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#5 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#107 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_misc.c#20 integrate
.. //depot/projects/hammer/sys/i386/ibcs2/imgact_coff.c#16 integrate
.. //depot/projects/hammer/sys/i386/include/pmap.h#35 integrate
.. //depot/projects/hammer/sys/i386/linux/imgact_linux.c#15 integrate
.. //depot/projects/hammer/sys/kern/imgact_aout.c#19 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#46 integrate
.. //depot/projects/hammer/sys/kern/imgact_gzip.c#12 integrate
.. //depot/projects/hammer/sys/kern/kern_acct.c#32 integrate
.. //depot/projects/hammer/sys/kern/kern_alq.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_descrip.c#74 integrate
.. //depot/projects/hammer/sys/kern/kern_exec.c#78 integrate
.. //depot/projects/hammer/sys/kern/kern_exit.c#70 integrate
.. //depot/projects/hammer/sys/kern/kern_jail.c#27 integrate
.. //depot/projects/hammer/sys/kern/kern_ktrace.c#36 integrate
.. //depot/projects/hammer/sys/kern/kern_linker.c#33 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#86 integrate
.. //depot/projects/hammer/sys/kern/link_elf.c#30 integrate
.. //depot/projects/hammer/sys/kern/link_elf_obj.c#54 integrate
.. //depot/projects/hammer/sys/kern/tty_cons.c#25 integrate
.. //depot/projects/hammer/sys/kern/uipc_mqueue.c#14 integrate
.. //depot/projects/hammer/sys/kern/uipc_syscalls.c#69 integrate
.. //depot/projects/hammer/sys/kern/uipc_usrreq.c#55 integrate
.. //depot/projects/hammer/sys/kern/vfs_acl.c#4 integrate
.. //depot/projects/hammer/sys/kern/vfs_aio.c#54 integrate
.. //depot/projects/hammer/sys/kern/vfs_bio.c#83 integrate
.. //depot/projects/hammer/sys/kern/vfs_cache.c#26 integrate
.. //depot/projects/hammer/sys/kern/vfs_default.c#51 integrate
.. //depot/projects/hammer/sys/kern/vfs_extattr.c#4 integrate
.. //depot/projects/hammer/sys/kern/vfs_lookup.c#31 integrate
.. //depot/projects/hammer/sys/kern/vfs_mount.c#88 integrate
.. //depot/projects/hammer/sys/kern/vfs_subr.c#122 integrate
.. //depot/projects/hammer/sys/kern/vfs_syscalls.c#77 integrate
.. //depot/projects/hammer/sys/kern/vfs_vnops.c#52 integrate
.. //depot/projects/hammer/sys/kern/vnode_if.src#24 integrate
.. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vfsops.c#23 integrate
.. //depot/projects/hammer/sys/nfs4client/nfs4_vnops.c#28 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_subs.c#31 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vfsops.c#51 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_vnops.c#56 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_serv.c#38 integrate
.. //depot/projects/hammer/sys/nfsserver/nfs_srvsubs.c#30 integrate
.. //depot/projects/hammer/sys/security/audit/audit_arg.c#11 integrate
.. //depot/projects/hammer/sys/security/audit/audit_syscalls.c#11 integrate
.. //depot/projects/hammer/sys/security/audit/audit_worker.c#7 integrate
.. //depot/projects/hammer/sys/security/mac/mac_process.c#14 integrate
.. //depot/projects/hammer/sys/security/mac/mac_syscalls.c#6 integrate
.. //depot/projects/hammer/sys/sys/param.h#103 integrate
.. //depot/projects/hammer/sys/sys/pmc.h#11 integrate
.. //depot/projects/hammer/sys/sys/vnode.h#74 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#21 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_snapshot.c#51 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_softdep.c#48 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vfsops.c#70 integrate
.. //depot/projects/hammer/sys/ufs/ffs/ffs_vnops.c#47 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_extattr.c#25 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_lookup.c#20 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_quota.c#27 integrate
.. //depot/projects/hammer/sys/ufs/ufs/ufs_vnops.c#52 integrate
.. //depot/projects/hammer/sys/vm/swap_pager.c#57 integrate
.. //depot/projects/hammer/sys/vm/vm_contig.c#39 integrate
.. //depot/projects/hammer/sys/vm/vm_object.c#73 integrate
.. //depot/projects/hammer/sys/vm/vnode_pager.c#44 integrate
.. //depot/projects/hammer/tools/regression/lib/msun/test-lrint.c#2 integrate
.. //depot/projects/hammer/tools/sched/schedgraph.py#10 integrate
.. //depot/projects/hammer/usr.bin/file/config.h#8 integrate
Differences ...
==== //depot/projects/hammer/contrib/file/ChangeLog#5 (text+ko) ====
@@ -1,3 +1,84 @@
+2007-12-28 15:06 Christos Zoulas <christos at zoulas.com>
+
+ * strtof detection
+
+ * remove bogus regex magic that could cause a DoS
+
+ * better mismatch version message
+
+2007-12-27 11:35 Christos Zoulas <christos at zoulas.com>
+
+ * bring back some fixes from OpenBSD
+
+ * treat ELF dynamic objects as executables
+
+ * fix gcc warnings
+
+2007-12-01 19:55 Christos Zoulas <christos at zoulas.com>
+
+ * make sure we have zlib.h and libz to compile the builtin
+ decompress code
+
+2007-10-28 20:48 Christos Zoulas <christos at zoulas.com>
+
+ * float and double magic support (Behan Webster)
+
+2007-10-28 20:48 Christos Zoulas <christos at zoulas.com>
+
+ * Convert fortran to a soft test (Reuben Thomas)
+
+2007-10-23 5:25 Christos Zoulas <christos at zoulas.com>
+
+ * Add --with-filename, and --no-filename (Reuben Thomas)
+
+2007-10-23 3:59 Christos Zoulas <christos at zoulas.com>
+
+ * Rest of the mime split (Reuben Thomas)
+
+ * Make usage message generated from the flags so that
+ they stay consistent (Reuben Thomas)
+
+2007-10-20 3:06 Christos Zoulas <christos at zoulas.com>
+
+ * typo in comment, missing ifdef QUICK, remove unneeded code
+ (Charles Longeau)
+
+2007-10-17 3:33 Christos Zoulas <christos at zoulas.com>
+
+ * Fix problem printing -\012 in some entries
+
+ * Separate magic type and encoding flags (Reuben Thomas)
+
+2007-10-09 3:55 Christos Zoulas <christos at zoulas.com>
+
+ * configure fix for int64 and strndup (Reuben Thomas)
+
+2007-09-26 4:45 Christos Zoulas <christos at zoulas.com>
+
+ * Add magic_descriptor() function.
+
+ * Fix regression in elf reading code where the core name was
+ not being printed.
+
+ * Don't convert NUL's to spaces in {l,b}estring16 (Daniel Dawson)
+
+2007-08-19 6:30 Christos Zoulas <christos at zoulas.com>
+
+ * Make mime format consistent so that it can
+ be easily parsed:
+ mimetype [charset=character-set] [encoding=encoding-mime-type]
+
+ Remove spurious extra text from some MIME type printouts
+ (mostly in is_tar).
+
+ Fix one case where -i produced nothing at all (for a 1-byte file,
+ which is now classed as application/octet-stream).
+
+ Remove 7/8bit classifications, since they were arbitrary
+ and not based on the file data.
+
+ This work was done by Reuben Thomas
+
2007-05-24 10:00 Christos Zoulas <christos at zoulas.com>
* Fix another integer overflow (Colin Percival)
==== //depot/projects/hammer/contrib/file/Magdir/acorn#2 (text+ko) ====
@@ -30,3 +30,38 @@
0 string Maestro\r RISC OS music file
>8 byte x version %d
+>8 byte x type %d
+
+# Digital Symphony data files
+# From: Bernard Jungen (bern8817 at euphonynet.be)
+0 string \x02\x01\x13\x13\x13\x01\x0d\x10 Digital Symphony sound sample (RISC OS),
+>8 byte x version %d,
+>9 pstring x named "%s",
+>(9.b+19) byte =0 8-bit logarithmic
+>(9.b+19) byte =1 LZW-compressed linear
+>(9.b+19) byte =2 8-bit linear signed
+>(9.b+19) byte =3 16-bit linear signed
+>(9.b+19) byte =4 SigmaDelta-compressed linear
+>(9.b+19) byte =5 SigmaDelta-compressed logarithmic
+>(9.b+19) byte >5 unknown format
+
+0 string \x02\x01\x13\x13\x14\x12\x01\x0b Digital Symphony song (RISC OS),
+>8 byte x version %d,
+>9 byte =1 1 voice,
+>9 byte !1 %d voices,
+>10 leshort =1 1 track,
+>10 leshort !1 %d tracks,
+>12 leshort =1 1 pattern
+>12 leshort !1 %d patterns
+
+0 string \x02\x01\x13\x13\x10\x14\x12\x0e
+>9 byte =0 Digital Symphony sequence (RISC OS),
+>>8 byte x version %d,
+>>10 byte =1 1 line,
+>>10 byte !1 %d lines,
+>>11 leshort =1 1 position
+>>11 leshort !1 %d positions
+>9 byte =1 Digital Symphony pattern data (RISC OS),
+>>8 byte x version %d,
+>>10 leshort =1 1 pattern
+>>10 leshort !1 %d patterns
==== //depot/projects/hammer/contrib/file/Magdir/animation#7 (text+ko) ====
@@ -678,3 +678,14 @@
>0x21 byte x v%x
0 string DVDVIDEO-VMG Video manager,
>0x21 byte x v%x
+
+# From: Behan Webster <behanw at websterwood.com>
+# NuppelVideo used by Mythtv (*.nuv)
+0 regex NuppelVideo|MythTVVideo MythTV NuppelVideo
+>12 string x v%s
+>20 lelong x (%d
+>24 lelong x \bx%d),
+>36 string P \bprogressive,
+>36 string I \binterlaced,
+>40 ledouble x \baspect:%.2f,
+>48 ledouble x \bfps:%.2f
==== //depot/projects/hammer/contrib/file/Magdir/apple#4 (text+ko) ====
@@ -189,3 +189,44 @@
>0 byte <5 \b
>>13 byte 0x81 \b
>>>14 uleshort x \b, system %hd
+
+#------------------------------------------------------------------------------
+# CAF: Apple CoreAudio File Format
+#
+# Container format for high-end audio purposes.
+# From: David Remahl <dremahl at apple.com>
+#
+0 string caff CoreAudio Format audio file
+>4 beshort <10 version %d
+>6 beshort x
+
+
+#------------------------------------------------------------------------------
+# Keychain database files
+0 string kych Mac OS X Keychain File
+
+#------------------------------------------------------------------------------
+# Code Signing related file types
+0 belong 0xfade0c00 Mac OS X Code Requirement
+>8 belong 1 (opExpr)
+>4 belong x - %d bytes
+
+0 belong 0xfade0c01 Mac OS X Code Requirement Set
+>8 belong >1 containing %d items
+>4 belong x - %d bytes
+
+0 belong 0xfade0c02 Mac OS X Code Directory
+>8 belong x version %x
+>12 belong >0 flags 0x%x
+>4 belong x - %d bytes
+
+0 belong 0xfade0cc0 Mac OS X Detached Code Signature (non-executable)
+>4 belong x - %d bytes
+
+0 belong 0xfade0cc1 Mac OS X Detached Code Signature
+>8 belong >1 (%d elements)
+>4 belong x - %d bytes
+
+# From: "Nelson A. de Oliveira" <naoliv at gmail.com>
+# .vdi
+4 string innotek\ VirtualBox\ Disk\ Image %s
==== //depot/projects/hammer/contrib/file/Magdir/archive#8 (text+ko) ====
@@ -531,6 +531,7 @@
# ZIP archives (Greg Roelofs, c/o zip-bugs at wkuvx1.wku.edu)
0 string PK\003\004
+>4 byte 0x00 Zip archive data
>4 byte 0x09 Zip archive data, at least v0.9 to extract
>4 byte 0x0a Zip archive data, at least v1.0 to extract
>4 byte 0x0b Zip archive data, at least v1.1 to extract
@@ -731,3 +732,19 @@
>4 lelong 0x1000006D (EPOC release 3/4/5)
>4 lelong 0x10003A12 (EPOC release 6)
0 lelong 0x10201A7A Symbian installation file (Symbian OS 9.x)
+
+# Pack200 Java archives, http://jcp.org/en/jsr/detail?id=200
+0 belong 0xcafed00d Pack200 Java archive
+
+# From "Nelson A. de Oliveira" <naoliv at gmail.com>
+0 string MPQ\032 MoPaQ (MPQ) archive
+
+# From: Dirk Jagdmann <doj at cubic.org>
+# xar archive format: http://code.google.com/p/xar/
+0 string xar! xar archive
+>6 beshort x - version %ld
+
+# From: "Nelson A. de Oliveira" <naoliv at gmail.com>
+# .kgb
+0 string KGB_arch KGB Archiver file
+>10 string x with compression level %.1s
==== //depot/projects/hammer/contrib/file/Magdir/audio#8 (text+ko) ====
@@ -556,3 +556,10 @@
# From: Matthew Flaschen <matthew.flaschen at gatech.edu>
0 string #EXTM3U M3U playlist text
+# From: "Mateus Caruccio" <mateus at caruccio.com>
+# guitar pro v3,4,5 from http://filext.com/file-extension/gp3
+0 string \030FICHIER\ GUITAR\ PRO\ v3. Guitar Pro Ver. 3 Tablature
+
+# From: "Leslie P. Polzer" <leslie.polzer at gmx.net>
+60 string SONG SoundFX Module sound file
+
==== //depot/projects/hammer/contrib/file/Magdir/blender#2 (text+ko) ====
@@ -1,17 +1,37 @@
#------------------------------------------------------------------------------
-# blender: file(1) magic for Blender 3D data files
+# blender: file(1) magic for Blender 3D related files
#
-# Coded by Guillermo S. Romero <gsromero at alumnos.euitt.upm.es> using the
-# data from Ton Roosendaal <ton at blender.nl>. Ton or his company do not
-# support the rule, so mail GSR if problems with it. Rule version: 1.1.
-# You can get latest version with comments and details about the format
-# at http://acd.asoc.euitt.upm.es/~gsromero/3d/blender/magic.blender
+# Native format rule v1.2. For questions use the developers list
+# http://lists.blender.org/mailman/listinfo/bf-committers
+# GLOB chunk was moved near start and provides subversion info since 2.42
+
+0 string =BLENDER Blender3D,
+>7 string =_ saved as 32-bits
+>>8 string =v little endian
+>>>9 byte x with version %c.
+>>>10 byte x \b%c
+>>>11 byte x \b%c
+>>>0x40 string =GLOB \b.
+>>>>0x58 leshort x \b%.4d
+>>8 string =V big endian
+>>>9 byte x with version %c.
+>>>10 byte x \b%c
+>>>11 byte x \b%c
+>>>0x40 string =GLOB \b.
+>>>>0x58 beshort x \b%.4d
+>7 string =- saved as 64-bits
+>>8 string =v little endian
+>>9 byte x with version %c.
+>>10 byte x \b%c
+>>11 byte x \b%c
+>>0x44 string =GLOB \b.
+>>>0x60 leshort x \b%.4d
+>>8 string =V big endian
+>>>9 byte x with version %c.
+>>>10 byte x \b%c
+>>>11 byte x \b%c
+>>>0x44 string =GLOB \b.
+>>>>0x60 beshort x \b%.4d
-0 string =BLENDER Blender3D,
->7 string =_ saved as 32-bits
->7 string =- saved as 64-bits
->8 string =v little endian
->8 string =V big endian
->9 byte x with version %c.
->10 byte x \b%c
->11 byte x \b%c
+# Scripts that run in the embeded Python interpreter
+0 string #!BPY Blender3D BPython script
==== //depot/projects/hammer/contrib/file/Magdir/commands#6 (text+ko) ====
@@ -28,7 +28,8 @@
0 string/b #!\ /bin/awk awk script text executable
0 string/b #!\ /usr/bin/awk awk script text executable
# update to distinguish from *.vcf files
-0 regex BEGIN[[:space:]]*[{] awk script text
+# this is broken because postscript has /EBEGIN{ for example.
+#0 regex BEGIN[[:space:]]*[{] awk script text
# AT&T Bell Labs' Plan 9 shell
0 string/b #!\ /bin/rc Plan 9 rc shell script text executable
==== //depot/projects/hammer/contrib/file/Magdir/console#6 (text+ko) ====
@@ -191,3 +191,64 @@
0 string PPF10 Playstation Patch File version 1.0
>5 byte 0 \b, Simple Encoding
>6 string x \b, description: %s
+
+# From: Daniel Dawson <ddawson at icehouse.net>
+# SNES9x .smv "movie" file format.
+0 string SMV\x1A SNES9x input recording
+>0x4 lelong x \b, version %d
+# version 4 is latest so far
+>0x4 lelong <5
+>>0x8 ledate x \b, recorded at %s
+>>0xc lelong >0 \b, rerecorded %d times
+>>0x10 lelong x \b, %d frames long
+>>0x14 byte >0 \b, data for controller(s):
+>>>0x14 byte &0x1 #1
+>>>0x14 byte &0x2 #2
+>>>0x14 byte &0x4 #3
+>>>0x14 byte &0x8 #4
+>>>0x14 byte &0x10 #5
+>>0x15 byte ^0x1 \b, begins from snapshot
+>>0x15 byte &0x1 \b, begins from reset
+>>0x15 byte ^0x2 \b, NTSC standard
+>>0x15 byte &0x2 \b, PAL standard
+>>0x17 byte &0x1 \b, settings:
+# WIP1Timing not used as of version 4
+>>>0x4 lelong <4
+>>>>0x17 byte &0x2 WIP1Timing
+>>>0x17 byte &0x4 Left+Right
+>>>0x17 byte &0x8 VolumeEnvX
+>>>0x17 byte &0x10 FakeMute
+>>>0x17 byte &0x20 SyncSound
+# New flag as of version 4
+>>>0x4 lelong >3
+>>>>0x17 byte &0x80 NoCPUShutdown
+>>0x4 lelong <4
+>>>0x18 lelong >0x23
+>>>>0x20 leshort !0
+>>>>>0x20 lestring16 x \b, metadata: "%s"
+>>0x4 lelong >3
+>>>0x24 byte >0 \b, port 1:
+>>>>0x24 byte 1 joypad
+>>>>0x24 byte 2 mouse
+>>>>0x24 byte 3 SuperScope
+>>>>0x24 byte 4 Justifier
+>>>>0x24 byte 5 multitap
+>>>0x24 byte >0 \b, port 2:
+>>>>0x25 byte 1 joypad
+>>>>0x25 byte 2 mouse
+>>>>0x25 byte 3 SuperScope
+>>>>0x25 byte 4 Justifier
+>>>>0x25 byte 5 multitap
+>>>0x18 lelong >0x43
+>>>>0x40 leshort !0
+>>>>>0x40 lestring16 x \b, metadata: "%s"
+>>0x17 byte &0x40 \b, ROM:
+>>>(0x18.l-26) lelong x CRC32 0x%08x
+>>>(0x18.l-23) string x "%s"
+
+# From: "Nelson A. de Oliveira" <naoliv at gmail.com>
+# .w3g
+0 string Warcraft\ III\ recorded\ game %s
+# .w3m
+0 string HM3W Warcraft III map file
+
==== //depot/projects/hammer/contrib/file/Magdir/database#6 (text+ko) ====
@@ -210,3 +210,13 @@
16 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
17 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
18 string MIT-MAGIC-COOKIE-1 X11 Xauthority data
+
+# From: Maxime Henrion <mux at FreeBSD.org>
+# PostgreSQL's custom dump format, Maxime Henrion <mux at FreeBSD.org>
+0 string PGDMP PostgreSQL custom database dump
+>5 byte x - v%d
+>6 byte x \b.%d
+>5 beshort <=0x100 \b-0
+>5 beshort >0x100
+>>7 byte x \b-%d
+
==== //depot/projects/hammer/contrib/file/Magdir/elf#8 (text+ko) ====
@@ -51,10 +51,10 @@
>>>>36 lelong&0xf0000000 0x20000000 MIPS-III
>>>>36 lelong&0xf0000000 0x30000000 MIPS-IV
>>>>36 lelong&0xf0000000 0x40000000 MIPS-V
->>>>36 lelong&0xf0000000 0x60000000 MIPS32
->>>>36 lelong&0xf0000000 0x70000000 MIPS64
->>>>36 lelong&0xf0000000 0x80000000 MIPS32 rel2
->>>>36 lelong&0xf0000000 0x90000000 MIPS64 rel2
+>>>>36 lelong&0xf0000000 0x50000000 MIPS32
+>>>>36 lelong&0xf0000000 0x60000000 MIPS64
+>>>>36 lelong&0xf0000000 0x70000000 MIPS32 rel2
+>>>>36 lelong&0xf0000000 0x80000000 MIPS64 rel2
# only for 64-bit
>>>4 byte 2
>>>>48 lelong&0xf0000000 0x00000000 MIPS-I
@@ -62,10 +62,10 @@
>>>>48 lelong&0xf0000000 0x20000000 MIPS-III
>>>>48 lelong&0xf0000000 0x30000000 MIPS-IV
>>>>48 lelong&0xf0000000 0x40000000 MIPS-V
->>>>48 lelong&0xf0000000 0x60000000 MIPS32
->>>>48 lelong&0xf0000000 0x70000000 MIPS64
->>>>48 lelong&0xf0000000 0x80000000 MIPS32 rel2
->>>>48 lelong&0xf0000000 0x90000000 MIPS64 rel2
+>>>>48 lelong&0xf0000000 0x50000000 MIPS32
+>>>>48 lelong&0xf0000000 0x60000000 MIPS64
+>>>>48 lelong&0xf0000000 0x70000000 MIPS32 rel2
+>>>>48 lelong&0xf0000000 0x80000000 MIPS64 rel2
>>18 leshort 9 Amdahl - invalid byte order,
>>18 leshort 10 MIPS (deprecated),
>>18 leshort 11 RS6000 - invalid byte order,
@@ -139,10 +139,10 @@
>>>>36 belong&0xf0000000 0x20000000 MIPS-III
>>>>36 belong&0xf0000000 0x30000000 MIPS-IV
>>>>36 belong&0xf0000000 0x40000000 MIPS-V
->>>>36 belong&0xf0000000 0x60000000 MIPS32
->>>>36 belong&0xf0000000 0x70000000 MIPS64
->>>>36 belong&0xf0000000 0x80000000 MIPS32 rel2
->>>>36 belong&0xf0000000 0x90000000 MIPS64 rel2
+>>>>36 belong&0xf0000000 0x50000000 MIPS32
+>>>>36 belong&0xf0000000 0x60000000 MIPS64
+>>>>36 belong&0xf0000000 0x70000000 MIPS32 rel2
+>>>>36 belong&0xf0000000 0x80000000 MIPS64 rel2
# only for 64-bit
>>>4 byte 2
>>>>48 belong&0xf0000000 0x00000000 MIPS-I
@@ -150,10 +150,10 @@
>>>>48 belong&0xf0000000 0x20000000 MIPS-III
>>>>48 belong&0xf0000000 0x30000000 MIPS-IV
>>>>48 belong&0xf0000000 0x40000000 MIPS-V
->>>>48 belong&0xf0000000 0x60000000 MIPS32
->>>>48 belong&0xf0000000 0x70000000 MIPS64
->>>>48 belong&0xf0000000 0x80000000 MIPS32 rel2
->>>>48 belong&0xf0000000 0x90000000 MIPS64 rel2
+>>>>48 belong&0xf0000000 0x50000000 MIPS32
+>>>>48 belong&0xf0000000 0x60000000 MIPS64
+>>>>48 belong&0xf0000000 0x70000000 MIPS32 rel2
+>>>>48 belong&0xf0000000 0x80000000 MIPS64 rel2
>>18 beshort 9 Amdahl,
>>18 beshort 10 MIPS (deprecated),
>>18 beshort 11 RS6000,
@@ -196,6 +196,7 @@
>>18 beshort 88 Renesas M32R,
>>18 beshort 94 Tensilica Xtensa,
>>18 beshort 97 NatSemi 32k,
+>>18 beshort 0x18ad AVR32 (unofficial),
>>18 beshort 0x9026 Alpha (unofficial),
>>18 beshort 0xa390 IBM S/390 (obsolete),
>>20 belong 0 invalid version
==== //depot/projects/hammer/contrib/file/Magdir/filesystems#8 (text+ko) ====
@@ -52,7 +52,13 @@
>>>>11 ulelong >0 \b, %d sectors/track
>>>>15 ulelong >0 \b, %d cylinders
+# updated by Joerg Jenderek at Sep 2007
+# only for sector sizes with 512 or more Bytes
0x1FE leshort 0xAA55 x86 boot sector
+# to do also for sectors < than 512 Bytes and some other files, GRR
+#30 search/481 \x55\xAA x86 boot sector
+# not for BeOS floppy 1440k, MBRs
+#(11.s-2) uleshort 0xAA55 x86 boot sector
>2 string OSBS \b, OS/BS MBR
# J\xf6rg Jenderek <joerg dot jenderek at web dot de>
>0x8C string Invalid\ partition\ table \b, MS-DOS MBR
@@ -173,56 +179,59 @@
>>498 string BCDL\ \ \ \ BIN \b, Bootable CD Loader (1.50Z)
# mbr partion table entries
# OEM-ID not Microsoft,SYSLINUX,or MTOOLs
->3 string !MS
+>3 string !MS
>>3 string !SYSLINUX
>>>3 string !MTOOL
# not FAT (32 bit)
>>>>82 string !FAT32
#not IO.SYS
>>>>>472 string !IO\ \ \ \ \ \ SYS
+>>>>>>480 string !IO\ \ \ \ \ \ SYS
#not Linux kernel
->>>>>>514 string !HdrS
+>>>>>>>514 string !HdrS
+#not BeOS
+>>>>>>>>422 string !Be\ Boot\ Loader
# active flag 0 or 0x80 and type > 0
->>>>>>>446 ubyte <0x81
->>>>>>>>446 ubyte&0x7F 0
+>>>>>>>>>446 ubyte <0x81
+>>>>>>>>>>446 ubyte&0x7F 0
>>>>>>>>>>>450 ubyte >0 \b; partition 1: ID=0x%x
->>>>>>>>>>446 ubyte 0x80 \b, active
->>>>>>>>>>447 ubyte x \b, starthead %u
-#>>>>>>>>>>448 ubyte x \b, start C_S: 0x%x
-#>>>>>>>>>>448 ubeshort&1023 x \b, startcylinder? %d
->>>>>>>>>>454 ulelong x \b, startsector %u
->>>>>>>>>>458 ulelong x \b, %u sectors
+>>>>>>>>>>>>446 ubyte 0x80 \b, active
+>>>>>>>>>>>>447 ubyte x \b, starthead %u
+#>>>>>>>>>>>>448 ubyte x \b, start C_S: 0x%x
+#>>>>>>>>>>>>448 ubeshort&1023 x \b, startcylinder? %d
+>>>>>>>>>>>>454 ulelong x \b, startsector %u
+>>>>>>>>>>>>458 ulelong x \b, %u sectors
#
->>>>>>>462 ubyte <0x81
->>>>>>>>462 ubyte&0x7F 0
->>>>>>>>>466 ubyte >0 \b; partition 2: ID=0x%x
->>>>>>>>>>462 ubyte 0x80 \b, active
->>>>>>>>>>463 ubyte x \b, starthead %u
-#>>>>>>>>>>464 ubyte x \b, start C_S: 0x%x
-#>>>>>>>>>>464 ubeshort&1023 x \b, startcylinder? %d
->>>>>>>>>>470 ulelong x \b, startsector %u
->>>>>>>>>>474 ulelong x \b, %u sectors
+>>>>>>>>>462 ubyte <0x81
+>>>>>>>>>>462 ubyte&0x7F 0
+>>>>>>>>>>>466 ubyte >0 \b; partition 2: ID=0x%x
+>>>>>>>>>>>>462 ubyte 0x80 \b, active
+>>>>>>>>>>>>463 ubyte x \b, starthead %u
+#>>>>>>>>>>>>464 ubyte x \b, start C_S: 0x%x
+#>>>>>>>>>>>>464 ubeshort&1023 x \b, startcylinder? %d
+>>>>>>>>>>>>470 ulelong x \b, startsector %u
+>>>>>>>>>>>>474 ulelong x \b, %u sectors
#
->>>>>>>478 ubyte <0x81
->>>>>>>>478 ubyte&0x7F 0
->>>>>>>>>482 ubyte >0 \b; partition 3: ID=0x%x
->>>>>>>>>>478 ubyte 0x80 \b, active
->>>>>>>>>>479 ubyte x \b, starthead %u
-#>>>>>>>>>>480 ubyte x \b, start C_S: 0x%x
-#>>>>>>>>>>481 ubyte x \b, start C2S: 0x%x
-#>>>>>>>>>>480 ubeshort&1023 x \b, startcylinder? %d
->>>>>>>>>>486 ulelong x \b, startsector %u
->>>>>>>>>>490 ulelong x \b, %u sectors
+>>>>>>>>>478 ubyte <0x81
+>>>>>>>>>>478 ubyte&0x7F 0
+>>>>>>>>>>>482 ubyte >0 \b; partition 3: ID=0x%x
+>>>>>>>>>>>>478 ubyte 0x80 \b, active
+>>>>>>>>>>>>479 ubyte x \b, starthead %u
+#>>>>>>>>>>>>480 ubyte x \b, start C_S: 0x%x
+#>>>>>>>>>>>>481 ubyte x \b, start C2S: 0x%x
+#>>>>>>>>>>>>480 ubeshort&1023 x \b, startcylinder? %d
+>>>>>>>>>>>>486 ulelong x \b, startsector %u
+>>>>>>>>>>>>490 ulelong x \b, %u sectors
#
->>>>>>>494 ubyte <0x81
->>>>>>>>494 ubyte&0x7F 0
->>>>>>>>>498 ubyte >0 \b; partition 4: ID=0x%x
->>>>>>>>>>494 ubyte 0x80 \b, active
->>>>>>>>>>495 ubyte x \b, starthead %u
-#>>>>>>>>>>496 ubyte x \b, start C_S: 0x%x
-#>>>>>>>>>>496 ubeshort&1023 x \b, startcylinder? %d
->>>>>>>>>>502 ulelong x \b, startsector %u
->>>>>>>>>>506 ulelong x \b, %u sectors
+>>>>>>>>>494 ubyte <0x81
+>>>>>>>>>>494 ubyte&0x7F 0
+>>>>>>>>>>>498 ubyte >0 \b; partition 4: ID=0x%x
+>>>>>>>>>>>>494 ubyte 0x80 \b, active
+>>>>>>>>>>>>495 ubyte x \b, starthead %u
+#>>>>>>>>>>>>496 ubyte x \b, start C_S: 0x%x
+#>>>>>>>>>>>>496 ubeshort&1023 x \b, startcylinder? %d
+>>>>>>>>>>>>502 ulelong x \b, startsector %u
+>>>>>>>>>>>>506 ulelong x \b, %u sectors
# mbr partion table entries end
# http://www.acronis.de/
#FAT label=ACRONIS\ SZ
@@ -507,34 +516,52 @@
>>>>>>>498 ubyte&0xDF >0
>>>>>>>>498 string x \b.%-.3s
#
->486 ubyte&0xDF >0
->>416 string Non-System\ disk\ or\
->>>435 string disk\ error\r
->>>>447 string Replace\ and\ press\ any\ key\
->>>>>473 string when\ ready\r \b, Microsoft DOS Bootloader
->480 ubyte&0xDF >0
->>393 string Non-System\ disk\ or\
->>>412 string disk\ error\r
->>>>424 string Replace\ and\ press\ any\ key\
->>>>>450 string when\ ready\r \b, Microsoft DOS bootloader
-#IO.SYS
->>>>>480 string x \b %-.2s
->>>>>>482 ubyte&0xDF >0
->>>>>>>48 string x \b%-.6s
->>>>>488 ubyte&0xDF >0
->>>>>>488 string x \b.%-.3s
-#MSDOS.SYS
->>>>>>491 ubyte&0xDF >0 \b+
->>>>>>>491 string x \b%-.5s
->>>>>>>>496 ubyte&0xDF >0
->>>>>>>>>496 string x \b%-.3s
->>>>>>>499 ubyte&0xDF >0
->>>>>>>>499 string x \b.%-.3s
+>376 search/41 Non-System\ disk\ or\
+>>395 search/41 disk\ error\r
+>>>407 search/41 Replace\ and\
+>>>>419 search/41 press\ \b,
+>>>>419 search/41 strike\ \b, old
+>>>>426 search/41 any\ key\ when\ ready\r MS or PC-DOS bootloader
+#449 Disk\ Boot\ failure\r MS 3.21
+#466 Boot\ Failure\r MS 3.30
+>>>>>468 search/18 \0
+#IO.SYS,IBMBIO.COM
+>>>>>>&0 string x \b %-.2s
+>>>>>>>&-20 ubyte&0xDF >0
+>>>>>>>>&-1 string x \b%-.4s
+>>>>>>>>>&-16 ubyte&0xDF >0
+>>>>>>>>>>&-1 string x \b%-.2s
+>>>>>>&8 ubyte&0xDF >0 \b.
+>>>>>>>&-1 string x \b%-.3s
+#MSDOS.SYS,IBMDOS.COM
+>>>>>>&11 ubyte&0xDF >0 \b+
+>>>>>>>&-1 string x \b%-.5s
+>>>>>>>>&-6 ubyte&0xDF >0
+>>>>>>>>>&-1 string x \b%-.1s
+>>>>>>>>>>&-5 ubyte&0xDF >0
+>>>>>>>>>>>&-1 string x \b%-.2s
+>>>>>>>&7 ubyte&0xDF >0 \b.
+>>>>>>>>&-1 string x \b%-.3s
+>441 string Cannot\ load\ from\ harddisk.\n\r
+>>469 string Insert\ Systemdisk\
+>>>487 string and\ press\ any\ key.\n\r \b, MS (2.11) DOS bootloader
#>43 string \224R-LOADER\ \ SYS =label
>54 string SYS
>>324 string VASKK
>>>495 string NEWLDR\0 \b, DR-DOS Bootloader (LOADER.SYS)
#
+>98 string Press\ a\ key\ to\ retry\0\r
+>>120 string Cannot\ find\ file\ \0\r
+>>>139 string Disk\ read\ error\0\r
+>>>>156 string Loading\ ...\0 \b, DR-DOS (3.41) Bootloader
+#DRBIOS.SYS
+>>>>>44 ubyte&0xDF >0
+>>>>>>44 string x \b %-.6s
+>>>>>>>50 ubyte&0xDF >0
+>>>>>>>>50 string x \b%-.2s
+>>>>>>52 ubyte&0xDF >0
+>>>>>>>52 string x \b.%-.3s
+#
>70 string IBMBIO\ \ COM
>>472 string Cannot\ load\ DOS!\
>>>489 string Any\ key\ to\ retry \b, DR-DOS Bootloader
@@ -679,26 +706,43 @@
#it also hangs with another message ("NF").
>>>>>492 string RENF \b, FAT (12 bit)
>>>>>495 string RENF \b, FAT (16 bit)
+# added by Joerg Jenderek
+# http://syslinux.zytor.com/iso.php
+0 ulelong 0x7c40eafa isolinux Loader
+# http://syslinux.zytor.com/pxe.php
+0 ulelong 0x007c05ea pxelinux Loader
+0 ulelong 0x60669c66 pxelinux Loader
# loader end
-# Joerg Jenderek
->446 ubyte 0
->>450 ubyte >0
->>>482 ubyte 0
->>>>498 ubyte 0
->>>>466 ubyte 0x05 \b, extended partition table
->>>>466 ubyte 0x0F \b, extended partition table (LBA)
->>>>466 ubyte 0x0 \b, extended partition table (last)
+# updated by Joerg Jenderek at Sep 2007
+>3 ubyte 0
+#no active flag
+>>446 ubyte 0
+# partition 1 not empty
+>>>450 ubyte >0
+# partitions 3,4 empty
+>>>>482 ubyte 0
+>>>>>498 ubyte 0
+# partition 2 ID=0,5,15
+>>>>>>466 ubyte <0x10
+>>>>>>>466 ubyte 0x05 \b, extended partition table
+>>>>>>>466 ubyte 0x0F \b, extended partition table (LBA)
+>>>>>>>466 ubyte 0x0 \b, extended partition table (last)
# JuMP short bootcodeoffset NOP assembler instructions will usually be EB xx 90
-# older drives may use E9 xx xx
+# http://mirror.href.com/thestarman/asm/2bytejumps.htmm#FWD
+# older drives may use Near JuMP instruction E9 xx xx
>0 lelong&0x009000EB 0x009000EB
>0 lelong&0x000000E9 0x000000E9
->>1 ubyte >37 \b, code offset 0x%x
+# maximal short forward jump is 07fx
+>1 ubyte <0xff \b, code offset 0x%x
# mtools-3.9.8/msdos.h
# usual values are marked with comments to get only informations of strange FAT systems
-# valid sectorsize are from 32 to 2048
->>>11 uleshort <2049
->>>>11 uleshort >31
+# valid sectorsize must be a power of 2 from 32 to 32768
+>>11 uleshort&0x000f x
+>>>11 uleshort <32769
+>>>>11 uleshort >31
>>>>>3 string >\0 \b, OEM-ID "%8.8s"
+#http://mirror.href.com/thestarman/asm/debug/debug2.htm#IHC
+>>>>>>8 string IHC \b cached by Windows 9M
>>>>>11 uleshort >512 \b, Bytes/sector %u
#>>>>>11 uleshort =512 \b, Bytes/sector %u=512 (usual)
>>>>>11 uleshort <512 \b, Bytes/sector %u
@@ -725,17 +769,18 @@
>>>>>26 ubyte >2 \b, heads %u
#>>>>>26 ubyte =2 \b, heads %u (usual floppy)
>>>>>26 ubyte =1 \b, heads %u
->>>>>28 ulelong >0 \b, hidden sectors %u
-#>>>>>28 ulelong =0 \b, hidden sectors %u (usual floppy)
->>>>>32 ulelong >0 \b, sectors %u (volumes > 32 MB)
-#>>>>>32 ulelong =0 \b, sectors %u (volumes > 32 MB)
+#skip for Digital Research DOS (version 3.41) 1440 kB Bootdisk
+>>>>>38 ubyte !0x70
+>>>>>>28 ulelong >0 \b, hidden sectors %u
+#>>>>>>28 ulelong =0 \b, hidden sectors %u (usual floppy)
+>>>>>>32 ulelong >0 \b, sectors %u (volumes > 32 MB)
+#>>>>>>32 ulelong =0 \b, sectors %u (volumes > 32 MB)
# FAT<32 specific
-# NOT le FAT3=NOT 3TAF=0xCCABBEB9
->>>>>82 ulelong&0xCCABBEB9 >0
->>>>>>36 ubyte >0x80 \b, physical drive 0x%x
-#>>>>>>36 ubyte =0x80 \b, physical drive 0x%x=0x80 (usual harddisk)
->>>>>>36 ubyte&0x7F >0 \b, physical drive 0x%x
-#>>>>>>36 ubyte =0 \b, physical drive 0x%x=0 (usual floppy)
+>>>>>82 string !FAT32
+#>>>>>>36 ubyte 0x80 \b, physical drive 0x%x=0x80 (usual harddisk)
+#>>>>>>36 ubyte 0 \b, physical drive 0x%x=0 (usual floppy)
+>>>>>>36 ubyte !0x80
+>>>>>>>36 ubyte !0 \b, physical drive 0x%x
>>>>>>37 ubyte >0 \b, reserved 0x%x
#>>>>>>37 ubyte =0 \b, reserved 0x%x
>>>>>>38 ubyte >0x29 \b, dos < 4.0 BootSector (0x%x)
@@ -1072,13 +1117,12 @@
# Modified for UDF by gerardo.cacciari at gmail.com
32769 string CD001
>38913 string !NSR0 ISO 9660 CD-ROM filesystem data
->38913 string NSR01 UDF filesystem data (version 1.0)
->38913 string NSR02 UDF filesystem data (version 1.5)
->38913 string NSR03 UDF filesystem data (version 2.0)
->38913 string >NSR03 UDF filesystem data (unknown version,
->>38917 byte x id 'NSR0%c')
->38913 string <NSR01 UDF filesystem data (unknown version,
->>38917 byte x id 'NSR0%c')
+>38913 string NSR0 UDF filesystem data
+>>38917 string 1 (version 1.0)
+>>38917 string 2 (version 1.5)
+>>38917 string 3 (version 2.0)
+>>38917 byte >0x33 (unknown version, ID 0x%X)
+>>38917 byte <0x31 (unknown version, ID 0x%X)
# "application id" which appears to be used as a volume label
>32808 string >\0 '%s'
>34816 string \000CD001\001EL\ TORITO\ SPECIFICATION (bootable)
@@ -1210,3 +1254,8 @@
>525 byte x Level %d
>525 byte x (ODS-%d OpenVMS file system),
>984 string x volume label is '%-12.12s'
+
+# From: Thomas Klausner <wiz at NetBSD.org>
+# http://filext.com/file-extension/DAA
+# describes the daa file format. The magic would be:
+0 string DAA\x0\x0\x0\x0\x0 PowerISO Direct-Access-Archive
==== //depot/projects/hammer/contrib/file/Magdir/java#4 (text+ko) ====
@@ -7,3 +7,17 @@
# From Martin Pool (m.pool at pharos.com.au)
0 beshort 0xaced Java serialization data
>2 beshort >0x0004 \b, version %d
+
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list