From f6ce6f4f74b5953312e0785198e55ed38e179f1d Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Wed, 23 Apr 2008 04:07:29 +0000 Subject: [PATCH] more Debian fixes from Abel Cheung --- magic/Magdir/elf | 10 ++++++---- magic/Magdir/hp | 34 +++++++++++++++++++++++++++------- magic/Magdir/riff | 2 +- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/magic/Magdir/elf b/magic/Magdir/elf index b362fe0c..74070502 100644 --- a/magic/Magdir/elf +++ b/magic/Magdir/elf @@ -7,7 +7,12 @@ # # What're the correct byte orders for the nCUBE and the Fujitsu VPP500? # -# updated by Daniel Quinlan (quinlan@yggdrasil.com) +# Created by: unknown +# Modified by (1): Daniel Quinlan +# Modified by (2): Peter Tobias (core support) +# Modified by (3): Christian 'Dr. Disk' Hechelmann (fix of core support) +# Modified by (4): (VMS Itanium) +# Modified by (5): Matthias Urlichs (Listing of many architectures) 0 string \177ELF ELF >4 byte 0 invalid class >4 byte 1 32-bit @@ -22,8 +27,6 @@ !:mime application/x-executable >>16 leshort 3 shared object, !:mime application/x-sharedlib -# Core handling from Peter Tobias -# corrections by Christian 'Dr. Disk' Hechelmann >>16 leshort 4 core file !:mime application/x-coredump # Core file detection is not reliable. @@ -270,7 +273,6 @@ >>7 byte 10 (Tru64) >>7 byte 11 (Novell Modesto) >>7 byte 12 (OpenBSD) -# VMS Itanium added by gerardo.cacciari@gmail.com >8 string \2 >>7 byte 13 (OpenVMS) >>7 byte 97 (ARM) diff --git a/magic/Magdir/hp b/magic/Magdir/hp index 33685b41..9281dae7 100644 --- a/magic/Magdir/hp +++ b/magic/Magdir/hp @@ -201,10 +201,13 @@ 0 string msgcat01 HP NLS message catalog, >8 long >0 %d messages -# addendum to /etc/magic with HP-48sx file-types by phk@data.fls.dk 1jan92 -0 string HPHP4 HP ->5 string 8 48 binary ->5 string 9 49 binary +# Summary: HP-48/49 calculator +# Created by: phk@data.fls.dk +# Modified by (1): AMAKAWA Shuhei +# Modified by (2): Samuel Thibault (HP49 support) +0 string HPHP HP +>4 string 48 48 binary +>4 string 49 49 binary >7 byte >64 - Rev %c >8 leshort 0x2911 (ADR) >8 leshort 0x2933 (REAL) @@ -231,7 +234,7 @@ >8 leshort 0x2e6d (LNAME) >8 leshort 0x2e92 (XLIB) -0 search/1 %%HP: HP text +0 string %%HP: HP text >6 string T(0) - T(0) >6 string T(1) - T(1) >6 string T(2) - T(2) @@ -259,6 +262,25 @@ >7 string J (ASCII Vector specification) >7 string K (wildcard) +# Summary: HP-38/39 calculator +# Created by: Samuel Thibault +0 string HP3 +>3 string 8 HP 38 +>3 string 9 HP 39 +>4 string Bin binary +>4 string Asc ASCII +>7 string A (Directory List) +>7 string B (Zaplet) +>7 string C (Note) +>7 string D (Program) +>7 string E (Variable) +>7 string F (List) +>7 string G (Matrix) +>7 string H (Library) +>7 string I (Target List) +>7 string J (ASCII Vector specification) +>7 string K (wildcard) + # hpBSD magic numbers 0 beshort 200 hp200 (68010) BSD >2 beshort 0407 impure binary @@ -409,6 +431,4 @@ >>>>>>>>>0xC4 belong 33 - received SIGXCPU >>>>>>>>>0xC4 belong 34 - received SIGXFSZ -# From: AMAKAWA Shuhei -#0 string HPHP49- HP49 binary diff --git a/magic/Magdir/riff b/magic/Magdir/riff index af8d2519..c6e3070b 100644 --- a/magic/Magdir/riff +++ b/magic/Magdir/riff @@ -135,7 +135,7 @@ >>>>>>>(104.l+132) string/c xvid XviD >>>>>>>(104.l+132) string/c h264 H.264 >>>>>>>(104.l+132) string/c wmv3 Windows Media Video 9 ->>>>>>>(104.l+132) string/c h264 X.264 +>>>>>>>(104.l+132) string/c h264 X.264 or H.264 >>>>>>>(104.l+132) lelong 0 ##>>>>>>>(104.l+132) string x (%.4s) # skip past first (video) LIST -- 2.40.0