From: Christos Zoulas Date: Thu, 18 Aug 2005 15:18:22 +0000 (+0000) Subject: Magic changes and cross-compile support. X-Git-Tag: FILE5_05~808 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e73ddf1e40a81c15bd3665ba8e37b1b3ade0c45d;p=file Magic changes and cross-compile support. --- diff --git a/ChangeLog b/ChangeLog index df95a93e..1c0a44b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-08-18 09:53 Christos Zoulas + + * Remove erroreous mention of /etc/magic in the file man page + This is gentoo bug 101639. (Mike Frysinger) + + * Cross-compile support and detection (Mike Frysinger) 2005-08-12 10:17 Christos Zoulas diff --git a/Makefile.in b/Makefile.in index d510b853..bd843d9a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -110,6 +110,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IS_CROSS_COMPILE_FALSE = @IS_CROSS_COMPILE_FALSE@ +IS_CROSS_COMPILE_TRUE = @IS_CROSS_COMPILE_TRUE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/configure b/configure index 67445666..760f1d94 100755 --- a/configure +++ b/configure @@ -463,7 +463,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT fsect FSECT5_TRUE FSECT5_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT fsect FSECT5_TRUE FSECT5_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL IS_CROSS_COMPILE_TRUE IS_CROSS_COMPILE_FALSE LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -23683,6 +23683,17 @@ _ACEOF fi + + +if test "$cross_compiling" = yes; then + IS_CROSS_COMPILE_TRUE= + IS_CROSS_COMPILE_FALSE='#' +else + IS_CROSS_COMPILE_TRUE='#' + IS_CROSS_COMPILE_FALSE= +fi + + ac_config_files="$ac_config_files Makefile src/Makefile magic/Makefile doc/Makefile python/Makefile" cat >confcache <<\_ACEOF @@ -23811,6 +23822,13 @@ echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${IS_CROSS_COMPILE_TRUE}" && test -z "${IS_CROSS_COMPILE_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"IS_CROSS_COMPILE\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"IS_CROSS_COMPILE\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -24418,6 +24436,8 @@ s,@F77@,$F77,;t t s,@FFLAGS@,$FFLAGS,;t t s,@ac_ct_F77@,$ac_ct_F77,;t t s,@LIBTOOL@,$LIBTOOL,;t t +s,@IS_CROSS_COMPILE_TRUE@,$IS_CROSS_COMPILE_TRUE,;t t +s,@IS_CROSS_COMPILE_FALSE@,$IS_CROSS_COMPILE_FALSE,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/configure.in b/configure.in index 610385ae..44e5bc0d 100644 --- a/configure.in +++ b/configure.in @@ -130,5 +130,8 @@ AC_CHECK_FUNCS(mmap strerror strtoul mbrtowc mkstemp getopt_long utimes utime wc dnl Checks for libraries AC_CHECK_LIB(z,gzopen) +dnl See if we are cross-compiling +AM_CONDITIONAL(IS_CROSS_COMPILE, test "$cross_compiling" = yes) + AC_CONFIG_FILES([Makefile src/Makefile magic/Makefile doc/Makefile python/Makefile]) AC_OUTPUT diff --git a/doc/Makefile.in b/doc/Makefile.in index 85d09fd2..841b59cd 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -91,6 +91,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IS_CROSS_COMPILE_FALSE = @IS_CROSS_COMPILE_FALSE@ +IS_CROSS_COMPILE_TRUE = @IS_CROSS_COMPILE_TRUE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/doc/file.man b/doc/file.man index 0790ea9c..7a8cc0af 100644 --- a/doc/file.man +++ b/doc/file.man @@ -1,5 +1,5 @@ .TH FILE __CSECTION__ "Copyright but distributable" -.\" $Id: file.man,v 1.56 2005/08/12 14:19:33 christos Exp $ +.\" $Id: file.man,v 1.57 2005/08/18 15:18:22 christos Exp $ .SH NAME file \- determine file type @@ -289,9 +289,6 @@ the -i option is specified. .I __MAGIC__.mime Default list of magic numbers, used to output mime types when the -i option is specified. -.TP -.I /etc/magic -Local additions to magic wisdom. .SH ENVIRONMENT The environment variable @@ -442,7 +439,7 @@ to identify character codes and attempt to identify the languages of non-ASCII files. .PP The list of contributors to the "Magdir" directory (source for the -/etc/magic +.I __MAGIC__ file) is too long to include here. You know who you are; thank you. .SH LEGAL NOTICE diff --git a/magic/Magdir/amigaos b/magic/Magdir/amigaos index ba2366c7..d37e643f 100644 --- a/magic/Magdir/amigaos +++ b/magic/Magdir/amigaos @@ -54,3 +54,7 @@ 0 string DOS\4 Amiga Fastdir DOS disk 0 string DOS\5 Amiga Fastdir FFS disk 0 string KICK Kickstart disk + +# From: Alex Beregszaszi +0 string LZX LZX compressed archive (Amiga) + diff --git a/magic/Magdir/audio b/magic/Magdir/audio index 33f1230c..32e4d43f 100644 --- a/magic/Magdir/audio +++ b/magic/Magdir/audio @@ -425,3 +425,20 @@ 0 string XAD! eXotic ADlib 0 string ofTAZ! eXtra Simple Music + +# Spectrum 128 tunes (.ay files). +# From: Emanuel Haupt +0 string ZXAYEMUL Spectrum 128 tune + +# From: Alex Beregszaszi +0 string MP+ Musepack +>3s byte&0x0f x SV%d + +0 string \0BONK BONK, +#>5 byte x version %d +>14 byte x %d channel(s), +>15 byte =1 lossless, +>15 byte =0 lossy, +>16 byte x mid-side + +384 string LockStream LockStream Embedded file (mostly MP3 on old Nokia phones) diff --git a/magic/Magdir/c64 b/magic/Magdir/c64 index 4ca143fb..a224b216 100644 --- a/magic/Magdir/c64 +++ b/magic/Magdir/c64 @@ -2,7 +2,7 @@ #------------------------------------------------------------------------------ # c64: file(1) magic for various commodore 64 related files # -# From +# From: Dirk Jagdmann 0x16500 belong 0x12014100 D64 Image 0x16500 belong 0x12014180 D71 Image @@ -11,7 +11,7 @@ 0 belong 0x43154164 X64 Image 0 string GCR-1541 GCR Image ->8 byte x version: $i +>8 byte x version: %i >9 byte x tracks: %i 9 string PSUR ARC archive (c64) @@ -25,3 +25,18 @@ 0 string CBM\144\0\0 Power 64 C64 Emulator Snapshot 0 belong 0xFF424CFF WRAptor packer (c64) + +0 string C64S\x20tape\x20file T64 tape Image +>32 leshort x Version:0x%x +>36 leshort !0 Entries:%i +>40 string x Name:%.24s + +0 string C64\x20tape\x20image\x20file\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0 T64 tape Image +>32 leshort x Version:0x%x +>36 leshort !0 Entries:%i +>40 string x Name:%.24s + +0 string C64S\x20tape\x20image\x20file\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0\x0 T64 tape Image +>32 leshort x Version:0x%x +>36 leshort !0 Entries:%i +>40 string x Name:%.24s diff --git a/magic/Magdir/cad b/magic/Magdir/cad index 92aa837e..03263401 100644 --- a/magic/Magdir/cad +++ b/magic/Magdir/cad @@ -11,7 +11,7 @@ >5 string \064\000\000\000\000 DWG ver. R14 # Microstation DGN/CIT Files (www.bentley.com) -# Written October 30, 2003 by Lester Hightower +# Last updated July 29, 2005 by Lester Hightower # DGN is the default file extension of Microstation/Intergraph CAD files. # CIT is the proprietary raster format (similar to TIFF) used to attach # raster underlays to Microstation DGN (vector) drawings. @@ -24,13 +24,31 @@ # 3F86C928&method=display&p_objectid=97F351F5-9C35-4E5E-89C280A93F86C928 # http://www.bentley.com/products/default.cfm?objectid=A5C2FD43-3AC9-4C71-B682 # 721C479F&method=display&p_objectid=A5C2FD43-3AC9-4C71-B682C7BE721C479F -0 string \010\011\376 Microstation ->3 string \002 ->>30 string \372\104 DGN File ->>30 string \172\104 DGN File ->>30 string \026\105 DGN File ->4 string \030\000\000 CIT File +0 string \010\011\376 Microstation +>3 string \002 +>>30 string \026\105 DGNFile +>>30 string \034\105 DGNFile +>>30 string \073\107 DGNFile +>>30 string \073\110 DGNFile +>>30 string \106\107 DGNFile +>>30 string \110\103 DGNFile +>>30 string \120\104 DGNFile +>>30 string \172\104 DGNFile +>>30 string \172\105 DGNFile +>>30 string \234\106 DGNFile +>>30 string \273\105 DGNFile +>>30 string \306\106 DGNFile +>>30 string \310\104 DGNFile +>>30 string \341\104 DGNFile +>>30 string \372\103 DGNFile +>>30 string \372\104 DGNFile +>>30 string \372\106 DGNFile +>>30 string \376\103 DGNFile +>4 string \030\000\000 CITFile +>4 string \030\000\003 CITFile # AutoCad, from Nahuel Greco +# AutoCAD DWG versions R12/R13/R14 (www.autodesk.com) 0 string AC1012 AutoCad (release 12) +0 string AC1013 AutoCad (release 13) 0 string AC1014 AutoCad (release 14) diff --git a/magic/Magdir/console b/magic/Magdir/console index ccade69d..65fe3272 100644 --- a/magic/Magdir/console +++ b/magic/Magdir/console @@ -161,6 +161,7 @@ >2 beshort x RAM start $%04x >6 string BS93 - - +# Opera file system that is used on the 3DO console +# From: Serge van den Boom +0 string \x01ZZZZZ\x01 3DO "Opera" file system diff --git a/magic/Magdir/cracklib b/magic/Magdir/cracklib new file mode 100644 index 00000000..07480ebf --- /dev/null +++ b/magic/Magdir/cracklib @@ -0,0 +1,13 @@ + +#------------------------------------------------------------------------------ +# cracklib: file (1) magic for cracklib v2.7 + +0 lelong 0x70775631 Cracklib password index, little endian +>4 long >0 (%i words) +>4 long 0 ("64-bit") +>>8 long >-1 (%i words) +0 belong 0x70775631 Cracklib password index, big endian +>4 belong >-1 (%i words) +0 long 0 +>4 belong 0x70775631 Cracklib password index, big endian ("64-bit") +>12 belong >0 (%i words) diff --git a/magic/Magdir/diff b/magic/Magdir/diff index 9e651465..187e892a 100644 --- a/magic/Magdir/diff +++ b/magic/Magdir/diff @@ -6,3 +6,5 @@ 0 string ***\ 'diff' output text 0 string Only\ in\ 'diff' output text 0 string Common\ subdirectories:\ 'diff' output text + +0 string Index: RCS/CVS diff output text diff --git a/magic/Magdir/elf b/magic/Magdir/elf index 1dee0bd8..9b559b1e 100644 --- a/magic/Magdir/elf +++ b/magic/Magdir/elf @@ -11,22 +11,39 @@ 0 string \177ELF ELF >4 byte 0 invalid class >4 byte 1 32-bit -# only for MIPS - in the future, the ABI field of e_flags should be used. ->>18 leshort 8 ->>>36 lelong &0x20 N32 ->>18 leshort 10 ->>>36 lelong &0x20 N32 ->>18 beshort 8 ->>>36 belong &0x20 N32 ->>18 beshort 10 ->>>36 belong &0x20 N32 >4 byte 2 64-bit >5 byte 0 invalid byte order >5 byte 1 LSB +>>16 leshort 0 no file type, +>>16 leshort 1 relocatable, +>>16 leshort 2 executable, +>>16 leshort 3 shared object, +# Core handling from Peter Tobias +# corrections by Christian 'Dr. Disk' Hechelmann +>>16 leshort 4 core file +# Core file detection is not reliable. +#>>>(0x38+0xcc) string >\0 of '%s' +#>>>(0x38+0x10) lelong >0 (signal %d), +>>16 leshort &0xff00 processor-specific, +>>18 leshort 0 no machine, +>>18 leshort 1 AT&T WE32100 - invalid byte order, +>>18 leshort 2 SPARC - invalid byte order, +>>18 leshort 3 Intel 80386, +>>18 leshort 4 Motorola +>>>36 lelong &0x01000000 68000 - invalid byte order, +>>>36 lelong &0x00810000 CPU32 - invalid byte order, +>>>36 lelong 0 68020 - invalid byte order, +>>18 leshort 5 Motorola 88000 - invalid byte order, +>>18 leshort 6 Intel 80486, +>>18 leshort 7 Intel 80860, # The official e_machine number for MIPS is now #8, regardless of endianness. # The second number (#10) will be deprecated later. For now, we still # say something if #10 is encountered, but only gory details for #8. ->>18 leshort 8 +>>18 leshort 8 MIPS, +>>>36 lelong &0x20 N32 +>>18 leshort 10 MIPS, +>>>36 lelong &0x20 N32 +>>18 leshort 8 # only for 32-bit >>>4 byte 1 >>>>36 lelong&0xf0000000 0x00000000 MIPS-I @@ -49,29 +66,6 @@ >>>>48 lelong&0xf0000000 0x70000000 MIPS64 >>>>48 lelong&0xf0000000 0x80000000 MIPS32 rel2 >>>>48 lelong&0xf0000000 0x90000000 MIPS64 rel2 ->>16 leshort 0 no file type, ->>16 leshort 1 relocatable, ->>16 leshort 2 executable, ->>16 leshort 3 shared object, -# Core handling from Peter Tobias -# corrections by Christian 'Dr. Disk' Hechelmann ->>16 leshort 4 core file -# Core file detection is not reliable. -#>>>(0x38+0xcc) string >\0 of '%s' -#>>>(0x38+0x10) lelong >0 (signal %d), ->>16 leshort &0xff00 processor-specific, ->>18 leshort 0 no machine, ->>18 leshort 1 AT&T WE32100 - invalid byte order, ->>18 leshort 2 SPARC - invalid byte order, ->>18 leshort 3 Intel 80386, ->>18 leshort 4 Motorola ->>>36 lelong &0x01000000 68000 - invalid byte order, ->>>36 lelong &0x00810000 CPU32 - invalid byte order, ->>>36 lelong 0 68020 - invalid byte order, ->>18 leshort 5 Motorola 88000 - invalid byte order, ->>18 leshort 6 Intel 80486, ->>18 leshort 7 Intel 80860, ->>18 leshort 8 MIPS, >>18 leshort 9 Amdahl - invalid byte order, >>18 leshort 10 MIPS (deprecated), >>18 leshort 11 RS6000 - invalid byte order, @@ -98,7 +92,7 @@ >>18 leshort 47 Hitachi H8/300H, >>18 leshort 48 Hitachi H8S, >>18 leshort 49 Hitachi H8/500, ->>18 leshort 50 IA-64 (Intel 64 bit architecture) +>>18 leshort 50 IA-64, >>18 leshort 51 Stanford MIPS-X, >>18 leshort 52 Motorola Coldfire, >>18 leshort 53 Motorola M68HC12, @@ -111,8 +105,31 @@ >>20 lelong 1 version 1 >>36 lelong 1 MathCoPro/FPU/MAU Required >5 byte 2 MSB +>>16 beshort 0 no file type, +>>16 beshort 1 relocatable, +>>16 beshort 2 executable, +>>16 beshort 3 shared object, +>>16 beshort 4 core file, +#>>>(0x38+0xcc) string >\0 of '%s' +#>>>(0x38+0x10) belong >0 (signal %d), +>>16 beshort &0xff00 processor-specific, +>>18 beshort 0 no machine, +>>18 beshort 1 AT&T WE32100, +>>18 beshort 2 SPARC, +>>18 beshort 3 Intel 80386 - invalid byte order, +>>18 beshort 4 Motorola +>>>36 belong &0x01000000 68000, +>>>36 belong &0x00810000 CPU32, +>>>36 belong 0 68020, +>>18 beshort 5 Motorola 88000, +>>18 beshort 6 Intel 80486 - invalid byte order, +>>18 beshort 7 Intel 80860, # only for MIPS - see comment in little-endian section above. ->>18 beshort 8 +>>18 beshort 8 MIPS, +>>>36 belong &0x20 N32 +>>18 beshort 10 MIPS, +>>>36 belong &0x20 N32 +>>18 beshort 8 # only for 32-bit >>>4 byte 1 >>>>36 belong&0xf0000000 0x00000000 MIPS-I @@ -135,26 +152,6 @@ >>>>48 belong&0xf0000000 0x70000000 MIPS64 >>>>48 belong&0xf0000000 0x80000000 MIPS32 rel2 >>>>48 belong&0xf0000000 0x90000000 MIPS64 rel2 ->>16 beshort 0 no file type, ->>16 beshort 1 relocatable, ->>16 beshort 2 executable, ->>16 beshort 3 shared object, ->>16 beshort 4 core file, -#>>>(0x38+0xcc) string >\0 of '%s' -#>>>(0x38+0x10) belong >0 (signal %d), ->>16 beshort &0xff00 processor-specific, ->>18 beshort 0 no machine, ->>18 beshort 1 AT&T WE32100, ->>18 beshort 2 SPARC, ->>18 beshort 3 Intel 80386 - invalid byte order, ->>18 beshort 4 Motorola ->>>36 belong &0x01000000 68000, ->>>36 belong &0x00810000 CPU32, ->>>36 belong 0 68020, ->>18 beshort 5 Motorola 88000, ->>18 beshort 6 Intel 80486 - invalid byte order, ->>18 beshort 7 Intel 80860, ->>18 beshort 8 MIPS, >>18 beshort 9 Amdahl, >>18 beshort 10 MIPS (deprecated), >>18 beshort 11 RS6000, @@ -187,7 +184,7 @@ >>18 beshort 47 Hitachi H8/300H, >>18 beshort 48 Hitachi H8S, >>18 beshort 49 Hitachi H8/500, ->>18 beshort 50 Intel Merced Processor, +>>18 beshort 50 IA-64, >>18 beshort 51 Stanford MIPS-X, >>18 beshort 52 Motorola Coldfire, >>18 beshort 53 Motorola M68HC12, diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems index 41fdc262..fe18ac26 100644 --- a/magic/Magdir/filesystems +++ b/magic/Magdir/filesystems @@ -587,3 +587,17 @@ >28 leshort >1 >>51 lelong x blocksize: %d bytes, >39 ledate x created: %s + +# AFS Dump Magic +# From: Ty Sarna +0 string \x01\xb3\xa1\x13\x22 AFS Dump +>&0 belong x (v%d) +>>&0 byte 0x76 +>>>&0 belong x Vol %d, +>>>>&0 byte 0x6e +>>>>>&0 string x %s +>>>>>>&1 byte 0x74 +>>>>>>>&0 beshort 2 +>>>>>>>>&4 bedate x on: %s +>>>>>>>>&0 bedate =0 full dump +>>>>>>>>&0 bedate !0 incremental since: %s diff --git a/magic/Magdir/flash b/magic/Magdir/flash index 2f343d8c..f14b460c 100644 --- a/magic/Magdir/flash +++ b/magic/Magdir/flash @@ -10,6 +10,9 @@ >3 byte x version %d 0 string CWS Macromedia Flash data (compressed), >3 byte x version %d +# From: Cal Peake +0 string FLV Macromedia Flash Video + # # From Dave Wilson 0 string AGD4\xbe\xb8\xbb\xcb\x00 Macromedia Freehand 9 Document diff --git a/magic/Magdir/linux b/magic/Magdir/linux index 0294a06a..c6c9d7be 100644 --- a/magic/Magdir/linux +++ b/magic/Magdir/linux @@ -181,3 +181,7 @@ 0 lelong =0x1413f33d SYSLINUX' LSS16 image data >4 leshort x \b, width %d >6 leshort x \b, height %d + +0 string OOOM User-Mode-Linux's Copy-On-Write disk image +>4 belong x version %d + diff --git a/magic/Magdir/misctools b/magic/Magdir/misctools index c32d52c2..3fab4729 100644 --- a/magic/Magdir/misctools +++ b/magic/Magdir/misctools @@ -1,5 +1,9 @@ #----------------------------------------------------------------------------- # misctools: file(1) magic for miscelanous UNIX tools. # -0 string %%!! X-Post-It-Note text -0 string BEGIN:VCALENDAR vCalendar calendar file +0 string %%!! X-Post-It-Note text +0 string BEGIN:VCALENDAR vCalendar calendar file + +# From: Alex Beregszaszi +4 string gtktalog GNOME Catalogue (gtktalog) +>13 string >\0 version %s diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos index b3e91d94..44ad6ce7 100644 --- a/magic/Magdir/msdos +++ b/magic/Magdir/msdos @@ -521,3 +521,22 @@ # of characters instead of all the "description length" # number of characters -- indicated by the ulelong at offset 60. >>(64.l) lestring16 >0 Description: %15.15s + +# From: Alex Beregszaszi +0 string COWD VMWare3 disk image +>12 belong x %d bytes + +0 string VMDK VMware4 disk image + +0 belong 0x514649fb QEMU Copy-On-Write disk image +>4 belong x version %d, +>24 belong x size %d + +>28 belong x %d + +0 string QEVM QEMU's suspend to disk image + +0 string Bochs\ Virtual\ HD\ Image Bochs disk image, +>32 string x type %s, +>48 string x subtype %s + +0 lelong 0x02468ace Bochs Sparse disk image diff --git a/magic/Magdir/perl b/magic/Magdir/perl index 417220e8..a00c642c 100644 --- a/magic/Magdir/perl +++ b/magic/Magdir/perl @@ -18,6 +18,15 @@ #0 regex package Perl5 module source text (via regex) 0 string package Perl5 module source text +# Perl POD documents +# From: Tom Hukins +0 string/B \=pod\n Perl POD document +0 string/B \n\=pod\n Perl POD document +0 string/B \=head1\ Perl POD document +0 string/B \n\=head1\ Perl POD document +0 string/B \=head2\ Perl POD document +0 string/B \n\=head2\ Perl POD document + # Perl Storable data files. 0 string perl-store perl Storable(v0.6) data >4 byte >0 (net-order %d) diff --git a/magic/Magdir/scientific b/magic/Magdir/scientific new file mode 100644 index 00000000..8554c265 --- /dev/null +++ b/magic/Magdir/scientific @@ -0,0 +1,61 @@ + +#------------------------------------------------------------------------------ +# scientific: file(1) magic for scientific formats +# +# From: Joe Krahn + +######################################################## +# CCP4 data and plot files: +0 string MTZ\040 MTZ reflection file + +92 string PLOT%%84 Plot84 plotting file +>52 byte 1 , Little-endian +>55 byte 1 , Big-endian + +######################################################## +# Electron density MAP/MASK formats + +0 string EZD_MAP NEWEZD Electron Density Map +109 string MAP\040( Old EZD Electron Density Map + +0 string/c :-)\040Origin BRIX Electron Density Map +>170 string >0 , Sigma:%.12s +#>4 string >0 %.178s +#>4 addr x %.178s + +7 string 18\040!NTITLE XPLOR ASCII Electron Density Map +9 string \040!NTITLE\012\040REMARK CNS ASCII electron density map + +208 string MAP\040 CCP4 Electron Density Map +# Assumes same stamp for float and double (normal case) +>212 byte 17 \b, Big-endian +>212 byte 34 \b, VAX format +>212 byte 68 \b, Little-endian +>212 byte 85 \b, Convex native + +############################################################ +# X-Ray Area Detector images +0 string R-AXIS4\ \ \ R-Axis Area Detector Image: +>796 lelong <20 Little-endian, IP #%d, +>>768 lelong >0 Size=%dx +>>772 lelong >0 \b%d +>796 belong <20 Big-endian, IP #%d, +>>768 belong >0 Size=%dx +>>772 belong >0 \b%d + +0 string RAXIS\ \ \ \ \ R-Axis Area Detector Image, Win32: +>796 lelong <20 Little-endian, IP #%d, +>>768 lelong >0 Size=%dx +>>772 lelong >0 \b%d +>796 belong <20 Big-endian, IP #%d, +>>768 belong >0 Size=%dx +>>772 belong >0 \b%d + + +1028 string MMX\000\000\000\000\000\000\000\000\000\000\000\000\000 MAR Area +Detector Image, +>1072 ulong >1 Compressed(%d), +>1100 ulong >1 %d headers, +>1104 ulong >0 %d x +>1108 ulong >0 %d, +>1120 ulong >0 %d bits/pixel diff --git a/magic/Magdir/varied.out b/magic/Magdir/varied.out index 791c9419..6126f363 100644 --- a/magic/Magdir/varied.out +++ b/magic/Magdir/varied.out @@ -30,3 +30,7 @@ # Harbour HRB files. 0 string \xc0HRB Harbour HRB file >4 short x version %d + +# From: Alex Beregszaszi +# 0 string exec BugOS executable +# 0 string pack BugOS archive diff --git a/magic/Makefile.am b/magic/Makefile.am index 78f85d4b..b38128bb 100644 --- a/magic/Makefile.am +++ b/magic/Makefile.am @@ -15,11 +15,17 @@ magic: Header Localstuff $(magic_FRAGMENTS) cat $$f; \ done >> $@ +if IS_CROSS_COMPILE +FILE_COMPILE = file +else +FILE_COMPILE = $(top_builddir)/src/file +endif + magic.mgc: magic - $(top_builddir)/src/file -C -m magic + $(FILE_COMPILE) -C -m magic magic.mime.mgc: magic.mime - $(top_builddir)/src/file -C -m $(srcdir)/magic.mime + $(FILE_COMPILE) -C -m $(srcdir)/magic.mime magic_FRAGMENTS = \ Magdir/acorn \ @@ -53,6 +59,7 @@ Magdir/cisco \ Magdir/citrus \ Magdir/claris \ Magdir/clipper \ +Magdir/cracklib \ Magdir/spec \ Magdir/commands \ Magdir/communications \ @@ -171,6 +178,7 @@ Magdir/sketch \ Magdir/smalltalk \ Magdir/sniffer \ Magdir/dyadic \ +Magdir/scientific \ Magdir/softquad \ Magdir/spectrum \ Magdir/sql \ diff --git a/magic/Makefile.in b/magic/Makefile.in index 72cd6beb..1cb27bb0 100644 --- a/magic/Makefile.in +++ b/magic/Makefile.in @@ -93,6 +93,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IS_CROSS_COMPILE_FALSE = @IS_CROSS_COMPILE_FALSE@ +IS_CROSS_COMPILE_TRUE = @IS_CROSS_COMPILE_TRUE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ @@ -163,6 +165,8 @@ target_alias = @target_alias@ pkgdata_DATA = magic magic.mime magic.mgc magic.mime.mgc EXTRA_DIST = magic2mime Localstuff Header magic.mime $(magic_FRAGMENTS) CLEANFILES = magic magic.mgc magic.mime.mgc +@IS_CROSS_COMPILE_FALSE@FILE_COMPILE = $(top_builddir)/src/file +@IS_CROSS_COMPILE_TRUE@FILE_COMPILE = file magic_FRAGMENTS = \ Magdir/acorn \ Magdir/adi \ @@ -195,6 +199,7 @@ Magdir/cisco \ Magdir/citrus \ Magdir/claris \ Magdir/clipper \ +Magdir/cracklib \ Magdir/spec \ Magdir/commands \ Magdir/communications \ @@ -313,6 +318,7 @@ Magdir/sketch \ Magdir/smalltalk \ Magdir/sniffer \ Magdir/dyadic \ +Magdir/scientific \ Magdir/softquad \ Magdir/spectrum \ Magdir/sql \ @@ -542,10 +548,10 @@ magic: Header Localstuff $(magic_FRAGMENTS) done >> $@ magic.mgc: magic - $(top_builddir)/src/file -C -m magic + $(FILE_COMPILE) -C -m magic magic.mime.mgc: magic.mime - $(top_builddir)/src/file -C -m $(srcdir)/magic.mime + $(FILE_COMPILE) -C -m $(srcdir)/magic.mime # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/magic/magic.mime b/magic/magic.mime index 2b274965..539dab2f 100644 --- a/magic/magic.mime +++ b/magic/magic.mime @@ -189,10 +189,10 @@ >8 string CDRA image/x-coreldraw # AAC (aka MPEG-2 NBC) -0 beshort&FFF6 0xFFF0 audio/X-HX-AAC-ADTS +0 beshort&0xfff6 0xfff0 audio/X-HX-AAC-ADTS 0 string ADIF audio/X-HX-AAC-ADIF -0 beshort&0xFFE0 0x56E0 audio/MP4A-LATM -0 beshort 0x4DE1 audio/MP4A-LATM +0 beshort&0xffe0 0x56e0 audio/MP4A-LATM +0 beshort 0x4De1 audio/MP4A-LATM # MPEG Layer 3 sound files 0 beshort &0xffe0 audio/mpeg diff --git a/python/Makefile.in b/python/Makefile.in index df8c6268..42f12bbf 100644 --- a/python/Makefile.in +++ b/python/Makefile.in @@ -83,6 +83,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IS_CROSS_COMPILE_FALSE = @IS_CROSS_COMPILE_FALSE@ +IS_CROSS_COMPILE_TRUE = @IS_CROSS_COMPILE_TRUE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@ diff --git a/src/Makefile.in b/src/Makefile.in index 60b42610..1d3d65d7 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -125,6 +125,8 @@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_SCRIPT = @INSTALL_SCRIPT@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +IS_CROSS_COMPILE_FALSE = @IS_CROSS_COMPILE_FALSE@ +IS_CROSS_COMPILE_TRUE = @IS_CROSS_COMPILE_TRUE@ LDFLAGS = @LDFLAGS@ LIBOBJS = @LIBOBJS@ LIBS = @LIBS@