From cc210a613488ae77c7063b0e30df85ae12d4cd8c Mon Sep 17 00:00:00 2001 From: Christos Zoulas Date: Mon, 28 Apr 2014 12:04:50 +0000 Subject: [PATCH] fix integer format widths --- magic/Magdir/animation | 8 +- magic/Magdir/apple | 6 +- magic/Magdir/archive | 6 +- magic/Magdir/audio | 4 +- magic/Magdir/compress | 6 +- magic/Magdir/database | 6 +- magic/Magdir/filesystems | 162 +++++++++++++++++++-------------------- magic/Magdir/gnome | 8 +- magic/Magdir/gpt | 6 +- magic/Magdir/images | 10 +-- magic/Magdir/isz | 16 ++-- magic/Magdir/linux | 6 +- magic/Magdir/msdos | 16 ++-- magic/Magdir/nitpicker | 10 +-- magic/Magdir/sql | 4 +- magic/Magdir/uterus | 6 +- magic/Magdir/virtual | 10 +-- magic/Magdir/vorbis | 14 ++-- magic/Magdir/windows | 16 ++-- 19 files changed, 160 insertions(+), 160 deletions(-) diff --git a/magic/Magdir/animation b/magic/Magdir/animation index 198b8c5a..c351419b 100644 --- a/magic/Magdir/animation +++ b/magic/Magdir/animation @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: animation,v 1.51 2014/03/14 18:47:29 christos Exp $ +# $File: animation,v 1.52 2014/04/28 12:04:50 christos Exp $ # animation: file(1) magic for animation/movie formats # # animation formats @@ -77,7 +77,7 @@ >>5 byte 66 \b, baseline >>5 byte 77 \b, main >>5 byte 88 \b, extended ->>7 byte x \b @ L %u +>>7 byte x \b @ L %hhu 0 belong&0xFFFFFF00 0x00000100 >3 byte 0xBA MPEG sequence !:mime video/mpeg @@ -88,7 +88,7 @@ >>4 byte 66 \b, baseline >>4 byte 77 \b, main >>4 byte 88 \b, extended ->>6 byte x \b @ L %u +>>6 byte x \b @ L %hhu # GRR too general as it catches also FoxPro Memo example NG.FPT >3 byte 0xB0 MPEG sequence, v4 # TODO: maybe this extra line exclude FoxPro Memo example NG.FPT starting with 000001b0 00000100 00000000 @@ -621,7 +621,7 @@ # Live MPEG-4 audio streams (instead of RTP FlexMux) 0 beshort&0xFFE0 0x56E0 MPEG-4 LOAS !:mime audio/x-mp4a-latm -#>1 beshort&0x1FFF x \b, %u byte packet +#>1 beshort&0x1FFF x \b, %hu byte packet >3 byte&0xE0 0x40 >>4 byte&0x3C 0x04 \b, single stream >>4 byte&0x3C 0x08 \b, 2 streams diff --git a/magic/Magdir/apple b/magic/Magdir/apple index 633c0127..8275e65f 100644 --- a/magic/Magdir/apple +++ b/magic/Magdir/apple @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: apple,v 1.27 2013/03/09 22:36:00 christos Exp $ +# $File: apple,v 1.28 2014/04/28 12:04:50 christos Exp $ # apple: file(1) magic for Apple file formats # 0 search/1/t FiLeStArTfIlEsTaRt binscii (apple ][) text @@ -23,9 +23,9 @@ >4 string x \b, Unknown Format >0xc byte 00 \b, DOS 3.3 sector order >>0x10 byte 00 \b, Volume 254 ->>0x10 byte&0x7f x \b, Volume %u +>>0x10 byte&0x7f x \b, Volume %hhu >0xc byte 01 \b, ProDOS sector order ->>0x14 short x \b, %u Blocks +>>0x14 short x \b, %hu Blocks >0xc byte 02 \b, NIB data # magic for Newton PDA package formats diff --git a/magic/Magdir/archive b/magic/Magdir/archive index 32f8592f..dcb5c394 100644 --- a/magic/Magdir/archive +++ b/magic/Magdir/archive @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# $File: archive,v 1.82 2014/03/14 18:47:29 christos Exp $ +# $File: archive,v 1.83 2014/04/28 12:04:50 christos Exp $ # archive: file(1) magic for archive formats (see also "msdos" for self- # extracting compressed archives) # @@ -498,7 +498,7 @@ # This is a really bad format. A file containing HAWAII will match this... #0 string HA HA archive data, #>2 leshort =1 1 file, -#>2 leshort >1 %u files, +#>2 leshort >1 %hu files, #>4 byte&0x0f =0 first is type CPY #>4 byte&0x0f =1 first is type ASC #>4 byte&0x0f =2 first is type HSC @@ -507,7 +507,7 @@ # suggestion: at least identify small archives (<1024 files) 0 belong&0xffff00fc 0x48410000 HA archive data >2 leshort =1 1 file, ->2 leshort >1 %u files, +>2 leshort >1 %hu files, >4 byte&0x0f =0 first is type CPY >4 byte&0x0f =1 first is type ASC >4 byte&0x0f =2 first is type HSC diff --git a/magic/Magdir/audio b/magic/Magdir/audio index ced93248..e49f24e8 100644 --- a/magic/Magdir/audio +++ b/magic/Magdir/audio @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: audio,v 1.68 2013/12/02 13:32:26 christos Exp $ +# $File: audio,v 1.69 2014/04/28 12:04:50 christos Exp $ # audio: file(1) magic for sound formats (see also "iff") # # Jan Nicolai Langfeldt (janl@ifi.uio.no), Dan Quinlan (quinlan@yggdrasil.com), @@ -467,7 +467,7 @@ >>17 belong&0xfffff0 0x0fa000 \b, 64 kHz >>21 byte&0xf >0 \b, >4G samples >>21 byte&0xf 0 \b ->>>22 belong >0 \b, %u samples +>>>22 belong >0 \b, %hhu samples >>>22 belong 0 \b, length unknown # (ISDN) VBOX voice message file (Wolfram Kleff) diff --git a/magic/Magdir/compress b/magic/Magdir/compress index 3dad5843..90b757fe 100644 --- a/magic/Magdir/compress +++ b/magic/Magdir/compress @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# $File: compress,v 1.55 2014/04/12 14:44:33 christos Exp $ +# $File: compress,v 1.56 2014/04/28 12:04:50 christos Exp $ # compress: file(1) magic for pure-compression formats (no archives) # # compress, gzip, pack, compact, huf, squeeze, crunch, freeze, yabba, etc. @@ -241,8 +241,8 @@ # Valve Pack (VPK) files 0 lelong 0x55aa1234 Valve Pak file ->0x4 lelong x \b, version %u ->0x8 lelong x \b, %u entries +>0x4 lelong x \b, version %lu +>0x8 lelong x \b, %lu entries # Snappy framing format # http://code.google.com/p/snappy/source/browse/trunk/framing_format.txt diff --git a/magic/Magdir/database b/magic/Magdir/database index 27f0105e..4c893418 100644 --- a/magic/Magdir/database +++ b/magic/Magdir/database @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: database,v 1.38 2014/03/29 15:40:34 christos Exp $ +# $File: database,v 1.39 2014/04/28 12:04:50 christos Exp $ # database: file(1) magic for various databases # # extracted from header/code files by Graeme Wilford (eep2gw@ee.surrey.ac.uk) @@ -375,8 +375,8 @@ #>>>>4 ulelong =0 \b, blocks size %lu >>>>4 ulelong !0 \b, blocks size %lu # Block length found 0 , 512 -#>>>>20 uleshort =0 \b, block length %u ->>>>20 uleshort !0 \b, block length %u +#>>>>20 uleshort =0 \b, block length %hu +>>>>20 uleshort !0 \b, block length %hu # Number of next available block for appending data >>>>0 ulelong =0 \b, next free block index %lu >>>>0 ulelong !0 \b, next free block index %lu diff --git a/magic/Magdir/filesystems b/magic/Magdir/filesystems index b3796f56..ce7aa9df 100644 --- a/magic/Magdir/filesystems +++ b/magic/Magdir/filesystems @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------ -# $File: filesystems,v 1.87 2014/03/01 03:04:06 christos Exp $ +# $File: filesystems,v 1.88 2014/04/28 12:04:50 christos Exp $ # filesystems: file(1) magic for different filesystems # 0 name partid @@ -233,7 +233,7 @@ #offset is 128 >>19 ubyte 128 >>>(19.b-1) ubyte 0x0 DOS Emulator image ->>>>7 ulelong >0 \b, %u heads +>>>>7 ulelong >0 \b, %lu heads >>>>11 ulelong >0 \b, %d sectors/track >>>>15 ulelong >0 \b, %d cylinders >>>>128 indirect x \b; contains @@ -1126,8 +1126,8 @@ >0 string RRaA >>0x1E4 string rrAa \b, FSInfosector #>>0x1FC uleshort =0 SHOULD BE ZERO ->>>0x1E8 ulelong <0xffffffff \b, %u free clusters ->>>0x1EC ulelong <0xffffffff \b, last allocated cluster %u +>>>0x1E8 ulelong <0xffffffff \b, %lu free clusters +>>>0x1EC ulelong <0xffffffff \b, last allocated cluster %lu # updated by Joerg Jenderek at Sep 2007 >3 ubyte 0 @@ -1182,8 +1182,8 @@ >>1 use partition-chs >>5 ubyte x \b), end-CHS ( >>5 use partition-chs ->>8 ulelong x \b), startsector %u ->>12 ulelong x \b, %u sectors +>>8 ulelong x \b), startsector %lu +>>12 ulelong x \b, %lu sectors # Print cylinder,head,sector (CHS) of partition entry 0 name partition-chs # cylinder @@ -1193,9 +1193,9 @@ >1 ubyte&0xC0 0xC0 \b3 >2 ubyte x \b%x # head ->0 ubyte x \b,%u +>0 ubyte x \b,%hhu # sector ->1 ubyte&0x3F x \b,%u +>1 ubyte&0x3F x \b,%hhu # FATX 0 string FATX FATX filesystem data @@ -1318,8 +1318,8 @@ >(0x1BC.s) string NDTmbr >>&-14 string 1234F\0 Turton mbr ( # parameters also viewed by install-mbr --list ->>>(0x1BC.s+7) ubyte x \b%u<= ->>>(0x1BC.s+9) ubyte x \bVersion<=%u +>>>(0x1BC.s+7) ubyte x \b%hhu<= +>>>(0x1BC.s+9) ubyte x \bVersion<=%hhu #>>>(0x1BC.s+8) ubyte x asm_flag_%x >>>(0x1BC.s+8) ubyte&1 1 \b,Y2K-Fix # variant used by testdisk of http://www.cgsecurity.org/wiki/Menu_MBRCode @@ -1330,8 +1330,8 @@ #>>>(0x1BC.s+11) ubyte x \b,cfg_def 0x%x # for older versions >>>(0x1BC.s+9) ubyte <2 -#>>>>(0x1BC.s+12) ubyte 18 \b,%u/18 seconds ->>>>(0x1BC.s+12) ubyte !18 \b,%u/18 seconds +#>>>>(0x1BC.s+12) ubyte 18 \b,%hhu/18 seconds +>>>>(0x1BC.s+12) ubyte !18 \b,%hhu/18 seconds # floppy A: or B: >>>>(0x1BC.s+13) ubyte <2 \b,floppy 0x%x >>>>(0x1BC.s+13) ubyte >1 @@ -1341,8 +1341,8 @@ >>>>>(0x1BC.s+13) ubyte !0x80 \b,drive 0x%x # for version >= 2 maximal timeout can be 65534 >>>(0x1BC.s+9) ubyte >1 -#>>>>(0x1BC.s+12) uleshort 18 \b,%u/18 seconds ->>>>(0x1BC.s+12) uleshort !18 \b,%u/18 seconds +#>>>>(0x1BC.s+12) uleshort 18 \b,%hu/18 seconds +>>>>(0x1BC.s+12) uleshort !18 \b,%hu/18 seconds # floppy A: or B: >>>>(0x1BC.s+14) ubyte <2 \b,floppy 0x%x >>>>(0x1BC.s+14) ubyte >1 @@ -1369,12 +1369,12 @@ # config_file for stage1_5 is 0xffffffff + default "/boot/grub/stage2" >>>>0x217 ubyte 0xFF stage1_5 >>>>0x217 ubyte <0xFF stage2 ->>>>0x206 ubyte x \b version %u ->>>>0x207 ubyte x \b.%u +>>>>0x206 ubyte x \b version %hhu +>>>>0x207 ubyte x \b.%hhu # module_size for 1.94 ->>>>0x208 ulelong <0xffffff \b, installed partition %u -#>>>>0x208 ulelong =0xffffff \b, %u (default) ->>>>0x208 ulelong >0xffffff \b, installed partition %u +>>>>0x208 ulelong <0xffffff \b, installed partition %lu +#>>>>0x208 ulelong =0xffffff \b, %lu (default) +>>>>0x208 ulelong >0xffffff \b, installed partition %lu # GRUB 0.5.95 unofficial >>>>0x20C ulelong&0x2E300000 0x2E300000 # 0=stage2 1=ffs 2=e2fs 3=fat 4=minix 5=reiserfs @@ -1430,43 +1430,43 @@ >>>>>3 string >\0 \b, OEM-ID "%-.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 ->>>>>13 ubyte >1 \b, sectors/cluster %u -#>>>>>13 ubyte =1 \b, sectors/cluster %u (usual on Floppies) +>>>>>11 uleshort >512 \b, Bytes/sector %hu +#>>>>>11 uleshort =512 \b, Bytes/sector %hu=512 (usual) +>>>>>11 uleshort <512 \b, Bytes/sector %hu +>>>>>13 ubyte >1 \b, sectors/cluster %hhu +#>>>>>13 ubyte =1 \b, sectors/cluster %hhu (usual on Floppies) >>>>>82 string FAT32 ->>>>>>14 uleshort !32 \b, reserved sectors %u -#>>>>>>14 uleshort =32 \b, reserved sectors %u (usual Fat32) +>>>>>>14 uleshort !32 \b, reserved sectors %hu +#>>>>>>14 uleshort =32 \b, reserved sectors %hu (usual Fat32) >>>>>82 string !FAT32 ->>>>>>14 uleshort >1 \b, reserved sectors %u -#>>>>>>14 uleshort =1 \b, reserved sectors %u (usual FAT12,FAT16) -#>>>>>>14 uleshort 0 \b, reserved sectors %u (usual NTFS) ->>>>>16 ubyte >2 \b, FATs %u -#>>>>>16 ubyte =2 \b, FATs %u (usual) ->>>>>16 ubyte =1 \b, FAT %u +>>>>>>14 uleshort >1 \b, reserved sectors %hu +#>>>>>>14 uleshort =1 \b, reserved sectors %hu (usual FAT12,FAT16) +#>>>>>>14 uleshort 0 \b, reserved sectors %hu (usual NTFS) +>>>>>16 ubyte >2 \b, FATs %hhu +#>>>>>16 ubyte =2 \b, FATs %hhu (usual) +>>>>>16 ubyte =1 \b, FAT %hhu >>>>>16 ubyte >0 ->>>>>17 uleshort >0 \b, root entries %u -#>>>>>17 uleshort =0 \b, root entries %u=0 (usual Fat32) ->>>>>19 uleshort >0 \b, sectors %u (volumes <=32 MB) -#>>>>>19 uleshort =0 \b, sectors %u=0 (usual Fat32) +>>>>>17 uleshort >0 \b, root entries %hu +#>>>>>17 uleshort =0 \b, root entries %hu=0 (usual Fat32) +>>>>>19 uleshort >0 \b, sectors %hu (volumes <=32 MB) +#>>>>>19 uleshort =0 \b, sectors %hu=0 (usual Fat32) >>>>>21 ubyte >0xF0 \b, Media descriptor 0x%x #>>>>>21 ubyte =0xF0 \b, Media descriptor 0x%x (usual floppy) >>>>>21 ubyte <0xF0 \b, Media descriptor 0x%x ->>>>>22 uleshort >0 \b, sectors/FAT %u -#>>>>>22 uleshort =0 \b, sectors/FAT %u=0 (usual Fat32) ->>>>>24 uleshort x \b, sectors/track %u ->>>>>26 ubyte >2 \b, heads %u -#>>>>>26 ubyte =2 \b, heads %u (usual floppy) ->>>>>26 ubyte =1 \b, heads %u +>>>>>22 uleshort >0 \b, sectors/FAT %hu +#>>>>>22 uleshort =0 \b, sectors/FAT %hu=0 (usual Fat32) +>>>>>24 uleshort x \b, sectors/track %hu +>>>>>26 ubyte >2 \b, heads %hhu +#>>>>>26 ubyte =2 \b, heads %hhu (usual floppy) +>>>>>26 ubyte =1 \b, heads %hhu # valid only for sector sizes with more then 32 Bytes >>>>>11 uleshort >32 # 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) +>>>>>>>28 ulelong >0 \b, hidden sectors %lu +#>>>>>>>28 ulelong =0 \b, hidden sectors %lu (usual floppy) +>>>>>>>32 ulelong >0 \b, sectors %lu (volumes > 32 MB) +#>>>>>>>32 ulelong =0 \b, sectors %lu (volumes > 32 MB) # FAT<32 bit specific >>>>>>>82 string !FAT32 #>>>>>>>>36 ubyte 0x80 \b, physical drive 0x%x=0x80 (usual harddisk) @@ -1493,21 +1493,21 @@ >>>>>>>54 string FAT16 \b (16 bit) # FAT32 bit specific >>>>>82 string FAT32 \b, FAT (32 bit) ->>>>>>36 ulelong x \b, sectors/FAT %u +>>>>>>36 ulelong x \b, sectors/FAT %lu # http://technet.microsoft.com/en-us/library/cc977221.aspx >>>>>>40 uleshort >0 \b, extension flags 0x%x -#>>>>>>40 uleshort =0 \b, extension flags %u ->>>>>>42 uleshort >0 \b, fsVersion %u -#>>>>>>42 uleshort =0 \b, fsVersion %u (usual) ->>>>>>44 ulelong >2 \b, rootdir cluster %u -#>>>>>>44 ulelong =2 \b, rootdir cluster %u -#>>>>>>44 ulelong =1 \b, rootdir cluster %u ->>>>>>48 uleshort >1 \b, infoSector %u -#>>>>>>48 uleshort =1 \b, infoSector %u (usual) ->>>>>>48 uleshort <1 \b, infoSector %u ->>>>>>50 uleshort >6 \b, Backup boot sector %u -#>>>>>>50 uleshort =6 \b, Backup boot sector %u (usual) ->>>>>>50 uleshort <6 \b, Backup boot sector %u +#>>>>>>40 uleshort =0 \b, extension flags %hu +>>>>>>42 uleshort >0 \b, fsVersion %hu +#>>>>>>42 uleshort =0 \b, fsVersion %hu (usual) +>>>>>>44 ulelong >2 \b, rootdir cluster %lu +#>>>>>>44 ulelong =2 \b, rootdir cluster %lu +#>>>>>>44 ulelong =1 \b, rootdir cluster %lu +>>>>>>48 uleshort >1 \b, infoSector %hu +#>>>>>>48 uleshort =1 \b, infoSector %hu (usual) +>>>>>>48 uleshort <1 \b, infoSector %hu +>>>>>>50 uleshort >6 \b, Backup boot sector %hu +#>>>>>>50 uleshort =6 \b, Backup boot sector %hu (usual) +>>>>>>50 uleshort <6 \b, Backup boot sector %hu # corrected by Joerg Jenderek at Feb 2011 according to http://thestarman.pcministry.com/asm/mbr/MSWIN41.htm#FSINFO >>>>>>52 ulelong >0 \b, reserved1 0x%x >>>>>>56 ulelong >0 \b, reserved2 0x%x @@ -1546,8 +1546,8 @@ # dos < 4.0 BootSector value found is 0x80 #38 ubyte =0x80 \b, dos < 4.0 BootSector (0x%x) >>>>>>>>22 uleshort =0 \b; NTFS ->>>>>>>>>24 uleshort >0 \b, sectors/track %u ->>>>>>>>>36 ulelong !0x800080 \b, physical drive 0x%x +>>>>>>>>>24 uleshort >0 \b, sectors/track %hu +>>>>>>>>>36 ulelong !0x800080 \b, physical drive 0x%lx >>>>>>>>>40 ulequad >0 \b, sectors %lld >>>>>>>>>48 ulequad >0 \b, $MFT start cluster %lld >>>>>>>>>56 ulequad >0 \b, $MFTMirror start cluster %lld @@ -2282,25 +2282,25 @@ # LFS 0 lelong 0x070162 LFS filesystem image >4 lelong 1 version 1, ->>8 lelong x \b blocks %u, ->>12 lelong x \b blocks per segment %u, +>>8 lelong x \b blocks %lu, +>>12 lelong x \b blocks per segment %lu, >4 lelong 2 version 2, ->>8 lelong x \b fragments %u, ->>12 lelong x \b bytes per segment %u, ->16 lelong x \b disk blocks %u, ->20 lelong x \b block size %u, ->24 lelong x \b fragment size %u, ->28 lelong x \b fragments per block %u, ->32 lelong x \b start for free list %u, ->36 lelong x \b number of free blocks %d, ->40 lelong x \b number of files %u, ->44 lelong x \b blocks available for writing %d, ->48 lelong x \b inodes in cache %d, ->52 lelong x \b inode file disk address 0x%x, ->56 lelong x \b inode file inode number %u, ->60 lelong x \b address of last segment written 0x%x, ->64 lelong x \b address of next segment to write 0x%x, ->68 lelong x \b address of current segment written 0x%x +>>8 lelong x \b fragments %lu, +>>12 lelong x \b bytes per segment %lu, +>16 lelong x \b disk blocks %lu, +>20 lelong x \b block size %lu, +>24 lelong x \b fragment size %lu, +>28 lelong x \b fragments per block %lu, +>32 lelong x \b start for free list %lu, +>36 lelong x \b number of free blocks %ld, +>40 lelong x \b number of files %lu, +>44 lelong x \b blocks available for writing %ld, +>48 lelong x \b inodes in cache %ld, +>52 lelong x \b inode file disk address 0x%lx, +>56 lelong x \b inode file inode number %lu, +>60 lelong x \b address of last segment written 0x%lx, +>64 lelong x \b address of next segment to write 0x%lx, +>68 lelong x \b address of current segment written 0x%lx 0 string td\000 floppy image data (TeleDisk, compressed) 0 string TD\000 floppy image data (TeleDisk) @@ -2331,11 +2331,11 @@ 0 belong 0x31181006 >0x16 short 0 UBIfs image >0x08 lequad x \b, sequence number %llu ->0x10 leshort x \b, length %u +>0x10 leshort x \b, length %hu >0x04 lelong x \b, CRC 0x%08x 0 belong 0x55424923 >0x04 short <2 >0x05 string \0\0\0 >0x1c string \0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0 ->0x04 short x UBI image, version %u +>0x04 short x UBI image, version %hu diff --git a/magic/Magdir/gnome b/magic/Magdir/gnome index 14d5aeb3..687b9c6c 100644 --- a/magic/Magdir/gnome +++ b/magic/Magdir/gnome @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: gnome,v 1.3 2013/02/05 15:20:47 christos Exp $ +# $File: gnome,v 1.4 2014/04/28 12:04:50 christos Exp $ # GNOME related files # Contributed by Josh Triplett @@ -20,11 +20,11 @@ >>>>>>&0 ubeqdate x \b, last modified %s >>>>>>&8 ubeqdate x \b, created %s >>>>>>&16 ubelong &1 ->>>>>>>&0 ubelong x \b, locked if idle for %u seconds +>>>>>>>&0 ubelong x \b, locked if idle for %lu seconds >>>>>>&16 ubelong ^1 \b, not locked if idle ->>>>>>&24 ubelong x \b, hash iterations %u +>>>>>>&24 ubelong x \b, hash iterations %lu >>>>>>&28 ubequad x \b, salt %llu ->>>>>>&52 ubelong x \b, %u item(s) +>>>>>>&52 ubelong x \b, %lu item(s) # From: Alex Beregszaszi 4 string gtktalog GNOME Catalogue (gtktalog) diff --git a/magic/Magdir/gpt b/magic/Magdir/gpt index 74aaaf7b..f15a4fee 100644 --- a/magic/Magdir/gpt +++ b/magic/Magdir/gpt @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: gpt,v 1.1 2013/02/18 18:31:09 christos Exp $ +# $File: gpt,v 1.2 2014/04/28 12:04:50 christos Exp $ # # GPT Partition table patterns. # Author: Rogier Goossens (goossens.rogier@gmail.com) @@ -218,8 +218,8 @@ # Print the information from a GPT partition table structure 0 name gpt-table ->10 uleshort x \b, version %u ->8 uleshort x \b.%u +>10 uleshort x \b, version %hu +>8 uleshort x \b.%hu # a GUID is just like a UUID, except it's displayed mixed-endian. >56 ulelong x \b, GUID: %08x >60 uleshort x \b-%04x diff --git a/magic/Magdir/images b/magic/Magdir/images index 6242b702..40e4c6d3 100644 --- a/magic/Magdir/images +++ b/magic/Magdir/images @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: images,v 1.89 2014/04/12 14:51:52 christos Exp $ +# $File: images,v 1.90 2014/04/28 12:04:50 christos Exp $ # images: file(1) magic for image formats (see also "iff", and "c-lang" for # XPM bitmaps) # @@ -771,14 +771,14 @@ # From Albert Cahalan # puredigital used it for the CVS disposable camcorder #8 lelong 4 ZBM bitmap image data -#>4 leshort x %u x -#>6 leshort x %u +#>4 leshort x %hu x +#>6 leshort x %hu # From Albert Cahalan # uncompressed 5:6:5 HighColor image for OLPC XO firmware icons 0 string C565 OLPC firmware icon image data ->4 leshort x %u x ->6 leshort x %u +>4 leshort x %hu x +>6 leshort x %hu # Applied Images - Image files from Cytovision # Gustavo Junior Alves diff --git a/magic/Magdir/isz b/magic/Magdir/isz index 316bbd4a..610866da 100644 --- a/magic/Magdir/isz +++ b/magic/Magdir/isz @@ -1,15 +1,15 @@ #------------------------------------------------------------------------------ -# $File: isz,v 1.1 2010/03/27 16:17:09 christos Exp $ +# $File: isz,v 1.2 2014/04/28 12:04:50 christos Exp $ # ISO Zipped file format # http://www.ezbsystems.com/isz/iszspec.txt 0 string IsZ! ISO Zipped file ->4 byte x \b, header size %u ->5 byte x \b, version %u ->8 lelong x \b, serial %u -#12 leshort x \b, sector size %u -#>16 lelong x \b, total sectors %u +>4 byte x \b, header size %hhu +>5 byte x \b, version %hhu +>8 lelong x \b, serial %lu +#12 leshort x \b, sector size %hu +#>16 lelong x \b, total sectors %lu >17 byte >0 \b, password protected #>24 lequad x \b, segment size %llu -#>32 lelong x \b, blocks %u -#>36 lelong x \b, block size %u +#>32 lelong x \b, blocks %lu +#>36 lelong x \b, block size %lu diff --git a/magic/Magdir/linux b/magic/Magdir/linux index 4360f2dc..fef51693 100644 --- a/magic/Magdir/linux +++ b/magic/Magdir/linux @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: linux,v 1.54 2014/03/02 00:01:29 christos Exp $ +# $File: linux,v 1.55 2014/04/28 12:04:50 christos Exp $ # linux: file(1) magic for Linux files # # Values for Linux/i386 binaries, from Daniel Quinlan @@ -113,7 +113,7 @@ >>498 leshort 0 RW-rootFS, >>508 leshort >0 root_dev 0x%X, >>502 leshort >0 swap_dev 0x%X, ->>504 leshort >0 RAMdisksize %u KB, +>>504 leshort >0 RAMdisksize %hu KB, >>506 leshort 0xFFFF Normal VGA >>506 leshort 0xFFFE Extended VGA >>506 leshort 0xFFFD Prompt for Videomode @@ -147,7 +147,7 @@ >>514 belong 0x908ed8b8 for memtest86 >497 leshort !0 x86 kernel ->>504 leshort >0 RAMdisksize=%u KB +>>504 leshort >0 RAMdisksize=%hu KB >>502 leshort >0 swap=0x%X >>508 leshort >0 root=0x%X >>>498 leshort 1 \b-ro diff --git a/magic/Magdir/msdos b/magic/Magdir/msdos index 57d5a257..dc2f8035 100644 --- a/magic/Magdir/msdos +++ b/magic/Magdir/msdos @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: msdos,v 1.94 2014/03/30 21:41:45 christos Exp $ +# $File: msdos,v 1.95 2014/04/28 12:04:50 christos Exp $ # msdos: file(1) magic for MS-DOS files # @@ -290,7 +290,7 @@ # TELVOX Teleinformatica CODEC self-extractor for OS/2: >49801 string \x79\xff\x80\xff\x76\xff \b, CODEC archive v3.21 >>49824 leshort =1 \b, 1 file ->>49824 leshort >1 \b, %u files +>>49824 leshort >1 \b, %hu files # added by Joerg Jenderek of http://www.freedos.org/software/?prog=kc # and http://www.freedos.org/software/?prog=kpdos @@ -760,15 +760,15 @@ # Microsoft Cabinet files 0 string/b MSCF\0\0\0\0 Microsoft Cabinet archive data !:mime application/vnd.ms-cab-compressed ->8 lelong x \b, %u bytes +>8 lelong x \b, %lu bytes >28 leshort 1 \b, 1 file ->28 leshort >1 \b, %u files +>28 leshort >1 \b, %hu files # InstallShield Cabinet files 0 string/b ISc( InstallShield Cabinet archive data >5 byte&0xf0 =0x60 version 6, >5 byte&0xf0 !0x60 version 4/5, ->(12.l+40) lelong x %u files +>(12.l+40) lelong x %lu files # Windows CE package files 0 string/b MSCE\0\0\0\0 Microsoft WinCE install header @@ -782,9 +782,9 @@ >20 lelong 10005 \b, Hitachi SH4 >20 lelong 70001 \b, ARM 7TDMI >52 leshort 1 \b, 1 file ->52 leshort >1 \b, %u files +>52 leshort >1 \b, %hu files >56 leshort 1 \b, 1 registry entry ->56 leshort >1 \b, %u registry entries +>56 leshort >1 \b, %hu registry entries # Windows Enhanced Metafile (EMF) @@ -937,7 +937,7 @@ # MS eBook format (.lit) 0 string/b ITOLITLS Microsoft Reader eBook Data ->8 lelong x \b, version %u +>8 lelong x \b, version %lu !:mime application/x-ms-reader # Windows CE Binary Image Data Format diff --git a/magic/Magdir/nitpicker b/magic/Magdir/nitpicker index d1a66287..f26138f1 100644 --- a/magic/Magdir/nitpicker +++ b/magic/Magdir/nitpicker @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: nitpicker,v 1.4 2009/09/19 16:28:11 christos Exp $ +# $File: nitpicker,v 1.5 2014/04/28 12:04:50 christos Exp $ # nitpicker: file(1) magic for Flowfiles. # From: Christian Jachmann http://www.nitpicker.de 0 string NPFF NItpicker Flow File @@ -8,7 +8,7 @@ >5 byte x %d >6 bedate x started: %s >10 bedate x stopped: %s ->14 belong x Bytes: %u ->18 belong x Bytes1: %u ->22 belong x Flows: %u ->26 belong x Pkts: %u +>14 belong x Bytes: %lu +>18 belong x Bytes1: %lu +>22 belong x Flows: %lu +>26 belong x Pkts: %lu diff --git a/magic/Magdir/sql b/magic/Magdir/sql index 5b8c3e3a..bb15d2b3 100644 --- a/magic/Magdir/sql +++ b/magic/Magdir/sql @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: sql,v 1.13 2013/08/27 04:02:33 christos Exp $ +# $File: sql,v 1.14 2014/04/28 12:04:50 christos Exp $ # sql: file(1) magic for SQL files # # From: "Marty Leisner" @@ -63,7 +63,7 @@ >68 belong =0x42654c6e Bentley Systems Localization File - SQLite3 database >68 belong =0x47504b47 OGC GeoPackage file - SQLite3 database >68 default x SQLite 3.x database ->>68 belong !0 \b, application id %u +>>68 belong !0 \b, application id %lu >>60 belong !0 \b, user version %d # SQLite Write-Ahead Log from SQLite version >= 3.7.0 diff --git a/magic/Magdir/uterus b/magic/Magdir/uterus index c5a139b5..ee80d190 100644 --- a/magic/Magdir/uterus +++ b/magic/Magdir/uterus @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: uterus,v 1.1 2012/12/18 18:53:32 christos Exp $ +# $File: uterus,v 1.2 2014/04/28 12:04:50 christos Exp $ # file(1) magic for uterus files # http://freecode.com/projects/uterus # @@ -10,7 +10,7 @@ >6 string . \b. >7 byte x \b%c >8 string \<\> \b, big-endian ->>16 belong >0 \b, slut size %u +>>16 belong >0 \b, slut size %lu >8 string \>\< \b, litte-endian ->>16 lelong >0 \b, slut size %u +>>16 lelong >0 \b, slut size %lu >10 byte &8 \b, compressed diff --git a/magic/Magdir/virtual b/magic/Magdir/virtual index 17ef44d2..c4c72988 100644 --- a/magic/Magdir/virtual +++ b/magic/Magdir/virtual @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: virtual,v 1.3 2014/03/03 14:19:46 christos Exp $ +# $File: virtual,v 1.4 2014/04/28 12:04:50 christos Exp $ # From: James Nobis # Microsoft hard disk images for: # Virtual Server @@ -13,14 +13,14 @@ # From: Richard W.M. Jones # VirtualBox Disk Image 0x40 ulelong 0xbeda107f VirtualBox Disk Image ->0x44 uleshort >0 \b, major %u ->0x46 uleshort >0 \b, minor %u +>0x44 uleshort >0 \b, major %hu +>0x46 uleshort >0 \b, minor %hu # libvirt # From: Philipp Hahn 0 string LibvirtQemudSave Libvirt QEMU Suspend Image ->0x10 lelong x \b, version %u ->0x14 lelong x \b, XML length %u +>0x10 lelong x \b, version %lu +>0x14 lelong x \b, XML length %lu >0x18 lelong 1 \b, running >0x1c lelong 1 \b, compressed diff --git a/magic/Magdir/vorbis b/magic/Magdir/vorbis index ed6c040c..fd1265b1 100644 --- a/magic/Magdir/vorbis +++ b/magic/Magdir/vorbis @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: vorbis,v 1.16 2009/09/19 16:28:13 christos Exp $ +# $File: vorbis,v 1.17 2014/04/28 12:04:50 christos Exp $ # vorbis: file(1) magic for Ogg/Vorbis files # # From Felix von Leitner @@ -24,7 +24,7 @@ #0 search/1000 OggS Ogg data 0 string OggS Ogg data !:mime application/ogg ->4 byte !0 UNKNOWN REVISION %u +>4 byte !0 UNKNOWN REVISION %hhu ##>4 byte 0 revision 0 >4 byte 0 ##>>14 lelong x (Serial %lX) @@ -34,8 +34,8 @@ >>28 string \x80theora \b, Theora video # non-Vorbis content: Kate >>28 string \x80kate\0\0\0\0 \b, Kate ->>>37 ubyte x v%u ->>>38 ubyte x \b.%u, +>>>37 ubyte x v%hhu +>>>38 ubyte x \b.%hhu, >>>40 byte 0 utf8 encoding, >>>40 byte !0 unknown character encoding, >>>60 string >\0 language %s, @@ -44,8 +44,8 @@ >>>76 string \0 no category set # non-Vorbis content: Skeleton >>28 string fishead\0 \b, Skeleton ->>>36 short x v%u ->>>40 short x \b.%u +>>>36 short x v%hu +>>>40 short x \b.%hu # non-Vorbis content: Speex >>28 string Speex\ \ \ \b, Speex audio # non-Vorbis content: OGM @@ -61,7 +61,7 @@ >>>35 lelong 0 >>>>39 ubyte 1 mono, >>>>39 ubyte 2 stereo, ->>>>39 ubyte >2 %u channels, +>>>>39 ubyte >2 %hhu channels, >>>>40 lelong x %lu Hz # Minimal, nominal and maximal bitrates specified when encoding >>>>48 string <\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff\xff \b, diff --git a/magic/Magdir/windows b/magic/Magdir/windows index 6c70e02a..b5b2d2e7 100644 --- a/magic/Magdir/windows +++ b/magic/Magdir/windows @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------ -# $File: windows,v 1.6 2013/04/19 20:12:29 christos Exp $ +# $File: windows,v 1.7 2014/04/28 12:04:50 christos Exp $ # windows: file(1) magic for Microsoft Windows # # This file is mainly reserved for files where programs @@ -106,7 +106,7 @@ >28 leqwdate x \b, ctime=%s >36 leqwdate x \b, mtime=%s >44 leqwdate x \b, atime=%s ->52 lelong x \b, length=%u, window= +>52 lelong x \b, length=%lu, window= >60 lelong&1 1 \bhide >60 lelong&2 2 \bnormal >60 lelong&4 4 \bshowminimized @@ -248,14 +248,14 @@ !:mime application/x-pnf # currently only found Major Version=1 and Minor Version=1 #>>>>0 uleshort =0x0101 -#>>>>>1 ubyte x \b, version %u -#>>>>>0 ubyte x \b.%u +#>>>>>1 ubyte x \b, version %hhu +#>>>>>0 ubyte x \b.%hhu >>>>0 uleshort !0x0101 ->>>>>1 ubyte x \b, version %u ->>>>>0 ubyte x \b.%u +>>>>>1 ubyte x \b, version %hhu +>>>>>0 ubyte x \b.%hhu # 1 ,2 (windows 98 SE) -#>>>>2 uleshort =2 \b, InfStyle %u ->>>>2 uleshort !2 \b, InfStyle %u +#>>>>2 uleshort =2 \b, InfStyle %hu +>>>>2 uleshort !2 \b, InfStyle %hu # PNF_FLAG_IS_UNICODE 0x00000001 # PNF_FLAG_HAS_STRINGS 0x00000002 # PNF_FLAG_SRCPATH_IS_URL 0x00000004 -- 2.40.0