head 1.1; branch 1.1.1; access; symbols netbsd-11-0-RC4:1.1.1.3 netbsd-11-0-RC3:1.1.1.3 netbsd-11-0-RC2:1.1.1.3 netbsd-11-0-RC1:1.1.1.3 perseant-exfatfs-base-20250801:1.1.1.3 netbsd-11:1.1.1.3.0.14 netbsd-11-base:1.1.1.3 netbsd-10-1-RELEASE:1.1.1.3 perseant-exfatfs-base-20240630:1.1.1.3 perseant-exfatfs:1.1.1.3.0.12 perseant-exfatfs-base:1.1.1.3 netbsd-8-3-RELEASE:1.1.1.2 netbsd-9-4-RELEASE:1.1.1.3 netbsd-10-0-RELEASE:1.1.1.3 netbsd-10-0-RC6:1.1.1.3 netbsd-10-0-RC5:1.1.1.3 netbsd-10-0-RC4:1.1.1.3 netbsd-10-0-RC3:1.1.1.3 netbsd-10-0-RC2:1.1.1.3 netbsd-10-0-RC1:1.1.1.3 FILE5_45:1.1.1.3 netbsd-10:1.1.1.3.0.10 netbsd-10-base:1.1.1.3 FILE5_43:1.1.1.3 netbsd-9-3-RELEASE:1.1.1.3 cjep_sun2x-base1:1.1.1.3 cjep_sun2x:1.1.1.3.0.8 cjep_sun2x-base:1.1.1.3 cjep_staticlib_x-base1:1.1.1.3 netbsd-9-2-RELEASE:1.1.1.3 cjep_staticlib_x:1.1.1.3.0.6 cjep_staticlib_x-base:1.1.1.3 FILE5_40:1.1.1.3 netbsd-9-1-RELEASE:1.1.1.3 FILE5_39:1.1.1.3 phil-wifi-20200421:1.1.1.3 phil-wifi-20200411:1.1.1.3 is-mlppp:1.1.1.3.0.4 is-mlppp-base:1.1.1.3 phil-wifi-20200406:1.1.1.3 netbsd-8-2-RELEASE:1.1.1.2 netbsd-9-0-RELEASE:1.1.1.3 netbsd-9-0-RC2:1.1.1.3 FILE5_38:1.1.1.3 netbsd-9-0-RC1:1.1.1.3 phil-wifi-20191119:1.1.1.3 netbsd-9:1.1.1.3.0.2 netbsd-9-base:1.1.1.3 phil-wifi-20190609:1.1.1.3 netbsd-8-1-RELEASE:1.1.1.2 FILE5_37:1.1.1.3 netbsd-8-1-RC1:1.1.1.2 pgoyette-compat-merge-20190127:1.1.1.2 pgoyette-compat-20190127:1.1.1.2 pgoyette-compat-20190118:1.1.1.2 pgoyette-compat-1226:1.1.1.2 pgoyette-compat-1126:1.1.1.2 pgoyette-compat-1020:1.1.1.2 FILE5_35:1.1.1.2 pgoyette-compat-0930:1.1.1.2 pgoyette-compat-0906:1.1.1.2 pgoyette-compat-0728:1.1.1.2 netbsd-8-0-RELEASE:1.1.1.2 phil-wifi:1.1.1.2.0.10 phil-wifi-base:1.1.1.2 pgoyette-compat-0625:1.1.1.2 netbsd-8-0-RC2:1.1.1.2 pgoyette-compat-0521:1.1.1.2 pgoyette-compat-0502:1.1.1.2 pgoyette-compat-0422:1.1.1.2 netbsd-8-0-RC1:1.1.1.2 FILE5_33:1.1.1.2 pgoyette-compat-0415:1.1.1.2 pgoyette-compat-0407:1.1.1.2 pgoyette-compat-0330:1.1.1.2 pgoyette-compat-0322:1.1.1.2 pgoyette-compat-0315:1.1.1.2 pgoyette-compat:1.1.1.2.0.8 pgoyette-compat-base:1.1.1.2 matt-nb8-mediatek:1.1.1.2.0.6 matt-nb8-mediatek-base:1.1.1.2 FILE5_32:1.1.1.2 perseant-stdc-iso10646:1.1.1.2.0.4 perseant-stdc-iso10646-base:1.1.1.2 netbsd-8:1.1.1.2.0.2 netbsd-8-base:1.1.1.2 FILE5_31:1.1.1.2 prg-localcount2-base3:1.1.1.1 prg-localcount2-base2:1.1.1.1 prg-localcount2-base1:1.1.1.1 prg-localcount2:1.1.1.1.0.6 prg-localcount2-base:1.1.1.1 pgoyette-localcount-20170426:1.1.1.1 bouyer-socketcan:1.1.1.1.0.4 bouyer-socketcan-base1:1.1.1.1 pgoyette-localcount:1.1.1.1.0.2 pgoyette-localcount-20170320:1.1.1.1 FILE5_30:1.1.1.1 CHRISTOS:1.1.1; locks; strict; comment @# @; 1.1 date 2017.02.10.17.42.59; author christos; state Exp; branches 1.1.1.1; next ; commitid HAP3kn9Hn6ovMqFz; 1.1.1.1 date 2017.02.10.17.42.59; author christos; state Exp; branches 1.1.1.1.2.1 1.1.1.1.4.1; next 1.1.1.2; commitid HAP3kn9Hn6ovMqFz; 1.1.1.2 date 2017.05.24.23.59.57; author christos; state Exp; branches 1.1.1.2.10.1; next 1.1.1.3; commitid WbyOU2LBE5qOyHSz; 1.1.1.3 date 2019.05.22.17.19.57; author christos; state Exp; branches; next ; commitid VXeNRYYruN1MWdoB; 1.1.1.1.2.1 date 2017.02.10.17.42.59; author pgoyette; state dead; branches; next 1.1.1.1.2.2; commitid jjw7cAwgyKq7RfKz; 1.1.1.1.2.2 date 2017.03.20.06.52.20; author pgoyette; state Exp; branches; next ; commitid jjw7cAwgyKq7RfKz; 1.1.1.1.4.1 date 2017.02.10.17.42.59; author bouyer; state dead; branches; next 1.1.1.1.4.2; commitid dUG7nkTKALCadqOz; 1.1.1.1.4.2 date 2017.04.21.16.51.24; author bouyer; state Exp; branches; next ; commitid dUG7nkTKALCadqOz; 1.1.1.2.10.1 date 2019.06.10.21.44.46; author christos; state Exp; branches; next ; commitid jtc8rnCzWiEEHGqB; desc @@ 1.1 log @Initial revision @ text @#------------------------------------------------------------------------------ # pc98: file(1) magic for the MSX Home Computer # v1.0 # Fabio R. Schmidlin # Maki-chan v1 Graphic format # The image resolution should be X=(44.L - 40.L) and Y=(46.L - 42.L), but I couldn't find a way to do so # http://www.jisyo.com/viewer/faq/maki_tech.htm 0 string/b MAKI01 Maki-chan v1. >6 ubyte|0x20 x \b%c image >8 ubelong >0x40404040 \b, system ID: >>8 byte x %c >>9 byte x \b%c >>10 byte x \b%c >>11 byte x \b%c >44 ubeshort x \b, %dx >46 ubeshort x \b%d >38 ubeshort&2 0 \b, 16 paletted RGB colors >38 ubeshort&2 2 \b, 8 fixed RGB colors >38 ubeshort&1 1 \b, 2:1 dot aspect ratio # Maki-chan v2 Graphic format # http://www.jisyo.com/viewer/faq/mag_tech.htm # http://mooncore.eu/bunny/txt/makichan.htm # http://metanest.jp/mag/mag.xhtml 0 string/b MAKI02\ \ Maki-chan v2 image, >8 byte x system ID: %c >9 byte x \b%c >10 byte x \b%c >11 byte x \b%c, >13 search/0x200 \x1A #Maki-chan video modes are a bit messy and seems to have been expanded over the years without too much planing: #1) When offset1(ubeshort) !=0x0344: # 1.1) And offset3(ubyte).b7=0: # - b0=pixel aspect ratio: 1=2:1 (note: this ignores that the machine's 1:1 pixel aspect ratio isn't really 1:1) # - b1=number of colors: 0=16 colors, 1=8 colors # - b2=Palette or fixed colors flag (called "analog" and "digital" in the doc): 0=Paletted, 1=Fixed colors encoded directly in the pixel data # 1.2) And offset3(ubyte).B7=1: # - b0=256 paletted colors # - b1=256 fixed colors using the MSX SCR8 palette #2) When offset1(ubeshort) =0x0344: # - 256x212 image with 19268 YJK colors. The usual resolution and color information fields from the file must be ignored >>&1 ubeshort 0x0344 256x212, 19268 fixed YJK colors >>&1 ubeshort !0x0344 >>>&5 uleshort+1 x %dx >>>&7 uleshort+1 x \b%d, >>>&0 ubyte&0x86 0x00 16 paletted RGB colors >>>&0 ubyte&0x86 0x02 8 paletted RGB colors >>>&0 ubyte&0x86 0x04 16 fixed RGB colors >>>&0 ubyte&0x86 0x06 8 fixed RGB colors >>>&0 ubyte&0x81 0x80 256 paletted RGB colors >>>&0 ubyte&0x81 0x81 256 fixed MSX-SCR8 colors >>>&0 ubyte&0x01 1 \b, 2:1 dot aspect ratio # XLD4 (Q4) picture 11 string/b MAJYO XLD4(Q4) picture # Yanagisawa Pi picture #0 string Pi\x1A\0 Yanagisawa Pi picture #>3 search/0x200 \x04 0 string Pi >2 search/0x200 \x1A >>&0 ubyte 0 >>>&3 ubyte 4 Yanagisawa Pi 16 color picture, >>>&4 byte x system ID: %c >>>&5 byte x \b%c >>>&6 byte x \b%c >>>&7 byte x \b%c, >>>&10 ubeshort x %dx >>>&12 ubeshort x \b%d >>>&3 ubyte 8 Yanagisawa Pi 256 color picture >>>&4 byte x system ID: %c >>>&5 byte x \b%c >>>&6 byte x \b%c >>>&7 byte x \b%c, >>>&10 ubeshort x %dx >>>&12 ubeshort x \b%d @ 1.1.1.1 log @2017-02-10 12:24 Christos Zoulas * release 5.30 2017-02-07 23:27 Christos Zoulas * If we exceeded the offset in a search return no match (Christoph Biedl) * Be more lenient on corrupt CDF files (Christoph Biedl) 2017-02-04 16:46 Christos Zoulas * pacify ubsan sign extension (oss-fuzz/524) 2017-02-01 12:42 Christos Zoulas * off by one in cdf parsing (PR/593) * report debugging sections in elf (PR/591) 2016-11-06 10:52 Christos Zoulas * Allow @@@@@@ in extensions * Add missing overflow check in der magic (Jonas Wagner) 2016-10-25 10:40 Christos Zoulas * release 5.29 2016-10-24 11:20 Christos Zoulas * der getlength overflow (Jonas Wagner) * multiple magic file load failure (Christoph Biedl) 2016-10-17 11:26 Christos Zoulas * CDF parsing improvements (Guy Helmer) 2016-07-20 7:26 Christos Zoulas * Add support for signed indirect offsets 2016-07-18 7:41 Christos Zoulas * cat /dev/null | file - should print empty (Christoph Biedl) 2016-07-05 15:20 Christos Zoulas * Bump string size from 64 to 96. 2016-06-13 20:20 Christos Zoulas * PR/556: Fix separators on annotations. 2016-06-13 19:40 Christos Zoulas * release 5.28 * fix leak on allocation failure 2016-06-01 1:20 Christos Zoulas * PR/555: Avoid overflow for offset > nbytes * PR/550: Segv on DER parsing: - use the correct variable for length - set offset to 0 on failure. 2016-05-13 12:00 Christos Zoulas * release 5.27 2016-04-18 9:35 Christos Zoulas * Errors comparing DER entries or computing offsets are just indications of malformed non-DER files. Don't print them. * Offset comparison was off-by-one. * Fix compression code (Werner Fink) * Put new bytes constant in the right file (not the generated one) 2016-04-16 18:34 Christos Zoulas * release 5.26 2016-03-31 13:50 Christos Zoulas * make the number of bytes read from files configurable. 2016-03-21 13:40 Christos Zoulas * Add bounds checks for DER code (discovered by Thomas Jarosch) * Change indirect recursion limit to indirect use count and bump from 15 to 50 to prevent abuse. 2016-03-13 20:39 Christos Zoulas * Add -00 which prints filename\0description\0 2016-03-01 13:28 Christos Zoulas * Fix ID3 indirect parsing 2016-01-19 10:18 Christos Zoulas * add DER parsing capability 2015-11-13 10:35 Christos Zoulas * provide dprintf(3) for the OS's that don't have it. 2015-11-11 16:25 Christos Zoulas * redo the compression code report decompression errors 2015-11-10 23:25 Christos Zoulas * REG_STARTEND code is not working as expected, delete it. 2015-11-09 16:05 Christos Zoulas * Add zlib support if we have it. 2015-11-05 11:22 Christos Zoulas * PR/492: compression forking was broken with magic_buffer. 2015-09-16 9:50 Christos Zoulas * release 5.25 2015-09-11 13:25 Christos Zoulas * add a limit to the length of regex searches 2015-09-08 9:50 Christos Zoulas * fix problems with --parameter (Christoph Biedl) 2015-07-11 10:35 Christos Zoulas * Windows fixes PR/466 (Jason Hood) 2015-07-09 10:35 Christos Zoulas * release 5.24 2015-06-11 8:52 Christos Zoulas * redo long option encoding to fix off-by-one in 5.23 2015-06-10 13:50 Christos Zoulas * release 5.23 2015-06-09 16:10 Christos Zoulas * Fix issue with regex range for magic with offset * Always return true from mget with USE (success to mget not match indication). Fixes mime evaluation after USE magic * PR/459: Don't insert magic entries to the list if there are parsing errors for them. 2015-06-03 16:00 Christos Zoulas * PR/455: Add utf-7 encoding 2015-06-03 14:30 Christos Zoulas * PR/455: Implement -Z, look inside, but don't report on compression * PR/454: Fix allocation error on bad magic. 2015-05-29 10:30 Christos Zoulas * handle MAGIC_CONTINUE everywhere, not just in softmagic 2015-05-21 14:30 Christos Zoulas * don't print descriptions for NAME types when mime. 2015-04-09 15:59 Christos Zoulas * Add --extension to list the known extensions for this file type Idea by Andrew J Roazen 2015-02-14 12:23 Christos Zoulas * Bump file search buffer size to 1M. 2015-01-09 14:35 Christos Zoulas * Fix multiple issues with date formats reported by Christoph Biedl: - T_LOCAL meaning was reversed - Arithmetic did not work Also stop adjusting daylight savings for gmt printing. 2015-01-05 13:00 Christos Zoulas * PR/411: Fix memory corruption from corrupt cdf file. @ text @@ 1.1.1.2 log @Import file-5.31; mostly oss-fuzz found bugs. @ text @d11 1 a11 1 >8 ubelong >0x40404040 \b, system ID: @ 1.1.1.2.10.1 log @Sync with HEAD @ text @d24 1 a24 1 # https://mooncore.eu/bunny/txt/makichan.htm @ 1.1.1.3 log @2019-05-14 22:26 Christos Zoulas * release 5.37 2019-05-09 22:27 Christos Zoulas * Make sure that continuation separators are printed with -k within softmagic 2019-05-06 22:27 Christos Zoulas * Change SIGPIPE saving and restoring during compression to use sigaction(2) instead of signal(3) and cache it. (Denys Vlasenko) * Cache stat(2) calls more to reduce number of calls (Denys Vlasenko) 2019-05-06 17:25 Christos Zoulas * PR/77: Handle --mime-type and -k correctly. 2019-05-03 15:26 Christos Zoulas * Switch decompression code to use vfork() because tools like rpmdiff and rpmbuild call libmagic with large process footprints (Denys Vlasenko) 2019-04-07 14:05 Christos Zoulas * PR/75: --enable-zlib, did not work. 2019-02-27 11:54 Christos Zoulas * Improve regex efficiency (Michael Schroeder) by: 1. Prefixing regex searches with regular search for keywords where possible 2. Using memmem(3) where available @ text @d24 1 a24 1 # https://mooncore.eu/bunny/txt/makichan.htm @ 1.1.1.1.4.1 log @file pc98 was added on branch bouyer-socketcan on 2017-04-21 16:51:24 +0000 @ text @d1 77 @ 1.1.1.1.4.2 log @Sync with HEAD @ text @a0 77 #------------------------------------------------------------------------------ # pc98: file(1) magic for the MSX Home Computer # v1.0 # Fabio R. Schmidlin # Maki-chan v1 Graphic format # The image resolution should be X=(44.L - 40.L) and Y=(46.L - 42.L), but I couldn't find a way to do so # http://www.jisyo.com/viewer/faq/maki_tech.htm 0 string/b MAKI01 Maki-chan v1. >6 ubyte|0x20 x \b%c image >8 ubelong >0x40404040 \b, system ID: >>8 byte x %c >>9 byte x \b%c >>10 byte x \b%c >>11 byte x \b%c >44 ubeshort x \b, %dx >46 ubeshort x \b%d >38 ubeshort&2 0 \b, 16 paletted RGB colors >38 ubeshort&2 2 \b, 8 fixed RGB colors >38 ubeshort&1 1 \b, 2:1 dot aspect ratio # Maki-chan v2 Graphic format # http://www.jisyo.com/viewer/faq/mag_tech.htm # http://mooncore.eu/bunny/txt/makichan.htm # http://metanest.jp/mag/mag.xhtml 0 string/b MAKI02\ \ Maki-chan v2 image, >8 byte x system ID: %c >9 byte x \b%c >10 byte x \b%c >11 byte x \b%c, >13 search/0x200 \x1A #Maki-chan video modes are a bit messy and seems to have been expanded over the years without too much planing: #1) When offset1(ubeshort) !=0x0344: # 1.1) And offset3(ubyte).b7=0: # - b0=pixel aspect ratio: 1=2:1 (note: this ignores that the machine's 1:1 pixel aspect ratio isn't really 1:1) # - b1=number of colors: 0=16 colors, 1=8 colors # - b2=Palette or fixed colors flag (called "analog" and "digital" in the doc): 0=Paletted, 1=Fixed colors encoded directly in the pixel data # 1.2) And offset3(ubyte).B7=1: # - b0=256 paletted colors # - b1=256 fixed colors using the MSX SCR8 palette #2) When offset1(ubeshort) =0x0344: # - 256x212 image with 19268 YJK colors. The usual resolution and color information fields from the file must be ignored >>&1 ubeshort 0x0344 256x212, 19268 fixed YJK colors >>&1 ubeshort !0x0344 >>>&5 uleshort+1 x %dx >>>&7 uleshort+1 x \b%d, >>>&0 ubyte&0x86 0x00 16 paletted RGB colors >>>&0 ubyte&0x86 0x02 8 paletted RGB colors >>>&0 ubyte&0x86 0x04 16 fixed RGB colors >>>&0 ubyte&0x86 0x06 8 fixed RGB colors >>>&0 ubyte&0x81 0x80 256 paletted RGB colors >>>&0 ubyte&0x81 0x81 256 fixed MSX-SCR8 colors >>>&0 ubyte&0x01 1 \b, 2:1 dot aspect ratio # XLD4 (Q4) picture 11 string/b MAJYO XLD4(Q4) picture # Yanagisawa Pi picture #0 string Pi\x1A\0 Yanagisawa Pi picture #>3 search/0x200 \x04 0 string Pi >2 search/0x200 \x1A >>&0 ubyte 0 >>>&3 ubyte 4 Yanagisawa Pi 16 color picture, >>>&4 byte x system ID: %c >>>&5 byte x \b%c >>>&6 byte x \b%c >>>&7 byte x \b%c, >>>&10 ubeshort x %dx >>>&12 ubeshort x \b%d >>>&3 ubyte 8 Yanagisawa Pi 256 color picture >>>&4 byte x system ID: %c >>>&5 byte x \b%c >>>&6 byte x \b%c >>>&7 byte x \b%c, >>>&10 ubeshort x %dx >>>&12 ubeshort x \b%d @ 1.1.1.1.2.1 log @file pc98 was added on branch pgoyette-localcount on 2017-03-20 06:52:20 +0000 @ text @d1 77 @ 1.1.1.1.2.2 log @Sync with HEAD @ text @a0 77 #------------------------------------------------------------------------------ # pc98: file(1) magic for the MSX Home Computer # v1.0 # Fabio R. Schmidlin # Maki-chan v1 Graphic format # The image resolution should be X=(44.L - 40.L) and Y=(46.L - 42.L), but I couldn't find a way to do so # http://www.jisyo.com/viewer/faq/maki_tech.htm 0 string/b MAKI01 Maki-chan v1. >6 ubyte|0x20 x \b%c image >8 ubelong >0x40404040 \b, system ID: >>8 byte x %c >>9 byte x \b%c >>10 byte x \b%c >>11 byte x \b%c >44 ubeshort x \b, %dx >46 ubeshort x \b%d >38 ubeshort&2 0 \b, 16 paletted RGB colors >38 ubeshort&2 2 \b, 8 fixed RGB colors >38 ubeshort&1 1 \b, 2:1 dot aspect ratio # Maki-chan v2 Graphic format # http://www.jisyo.com/viewer/faq/mag_tech.htm # http://mooncore.eu/bunny/txt/makichan.htm # http://metanest.jp/mag/mag.xhtml 0 string/b MAKI02\ \ Maki-chan v2 image, >8 byte x system ID: %c >9 byte x \b%c >10 byte x \b%c >11 byte x \b%c, >13 search/0x200 \x1A #Maki-chan video modes are a bit messy and seems to have been expanded over the years without too much planing: #1) When offset1(ubeshort) !=0x0344: # 1.1) And offset3(ubyte).b7=0: # - b0=pixel aspect ratio: 1=2:1 (note: this ignores that the machine's 1:1 pixel aspect ratio isn't really 1:1) # - b1=number of colors: 0=16 colors, 1=8 colors # - b2=Palette or fixed colors flag (called "analog" and "digital" in the doc): 0=Paletted, 1=Fixed colors encoded directly in the pixel data # 1.2) And offset3(ubyte).B7=1: # - b0=256 paletted colors # - b1=256 fixed colors using the MSX SCR8 palette #2) When offset1(ubeshort) =0x0344: # - 256x212 image with 19268 YJK colors. The usual resolution and color information fields from the file must be ignored >>&1 ubeshort 0x0344 256x212, 19268 fixed YJK colors >>&1 ubeshort !0x0344 >>>&5 uleshort+1 x %dx >>>&7 uleshort+1 x \b%d, >>>&0 ubyte&0x86 0x00 16 paletted RGB colors >>>&0 ubyte&0x86 0x02 8 paletted RGB colors >>>&0 ubyte&0x86 0x04 16 fixed RGB colors >>>&0 ubyte&0x86 0x06 8 fixed RGB colors >>>&0 ubyte&0x81 0x80 256 paletted RGB colors >>>&0 ubyte&0x81 0x81 256 fixed MSX-SCR8 colors >>>&0 ubyte&0x01 1 \b, 2:1 dot aspect ratio # XLD4 (Q4) picture 11 string/b MAJYO XLD4(Q4) picture # Yanagisawa Pi picture #0 string Pi\x1A\0 Yanagisawa Pi picture #>3 search/0x200 \x04 0 string Pi >2 search/0x200 \x1A >>&0 ubyte 0 >>>&3 ubyte 4 Yanagisawa Pi 16 color picture, >>>&4 byte x system ID: %c >>>&5 byte x \b%c >>>&6 byte x \b%c >>>&7 byte x \b%c, >>>&10 ubeshort x %dx >>>&12 ubeshort x \b%d >>>&3 ubyte 8 Yanagisawa Pi 256 color picture >>>&4 byte x system ID: %c >>>&5 byte x \b%c >>>&6 byte x \b%c >>>&7 byte x \b%c, >>>&10 ubeshort x %dx >>>&12 ubeshort x \b%d @