pe,pe_msdos_stub,coff: Add decoders

wader · Apr 3, 2024 · 892a42d · 892a42d
1 parent b67ce02
commit 892a42d
Show file tree

Hide file tree

Showing 20 changed files with 3,193 additions and 2 deletions.
diff --git a/format/all/all.fqtest b/format/all/all.fqtest
@@ -27,6 +27,7 @@ $ fq -n _registry.groups.probe
   "opentimestamps",
   "pcap",
   "pcapng",
+  "pe",
   "png",
   "tar",
   "tiff",
@@ -80,6 +81,7 @@ bytes                Raw bytes
 bzip2                bzip2 compression
 caff                 Live2D Cubism archive
 cbor                 Concise Binary Object Representation
+coff                 Common Object File Format
 csv                  Comma separated values
 dns                  DNS packet
 dns_tcp              DNS packet (TCP)
@@ -135,6 +137,7 @@ mpeg_pes             MPEG Packetized elementary stream
 mpeg_pes_packet      MPEG Packetized elementary stream packet
 mpeg_spu             Sub Picture Unit (DVD subtitle)
 mpeg_ts              MPEG Transport Stream
+msdos_stub           MS-DOS Stub
 msgpack              MessagePack
 nes                  iNES/NES 2.0 cartridge ROM format
 ogg                  OGG file
@@ -143,6 +146,7 @@ opentimestamps       OpenTimestamps file
 opus_packet          Opus packet
 pcap                 PCAP packet capture
 pcapng               PCAPNG packet capture
+pe                   Portable Executable
 pg_btree             PostgreSQL btree index file
 pg_control           PostgreSQL control file
 pg_heap              PostgreSQL heap file

diff --git a/format/all/all.go b/format/all/all.go
@@ -46,6 +46,7 @@ import (
 	_ "github.com/wader/fq/format/opentimestamps"
 	_ "github.com/wader/fq/format/opus"
 	_ "github.com/wader/fq/format/pcap"
+	_ "github.com/wader/fq/format/pe"
 	_ "github.com/wader/fq/format/png"
 	_ "github.com/wader/fq/format/postgres"
 	_ "github.com/wader/fq/format/prores"

diff --git a/format/format.go b/format/format.go
@@ -89,6 +89,7 @@ var (
 	Bzip2               = &decode.Group{Name: "bzip2"}
 	CAFF                = &decode.Group{Name: "caff"}
 	CBOR                = &decode.Group{Name: "cbor"}
+	COFF                = &decode.Group{Name: "coff"}
 	CSV                 = &decode.Group{Name: "csv"}
 	DNS                 = &decode.Group{Name: "dns"}
 	DNS_TCP             = &decode.Group{Name: "dns_tcp"}
@@ -144,7 +145,8 @@ var (
 	MPEG_PES_Packet     = &decode.Group{Name: "mpeg_pes_packet"}
 	MPEG_SPU            = &decode.Group{Name: "mpeg_spu"}
 	MPEG_TS             = &decode.Group{Name: "mpeg_ts"}
-	MPES_PES            = &decode.Group{Name: "mpeg_pes"}
+	MPEG_PES            = &decode.Group{Name: "mpeg_pes"}
+	MSDOS_Stub          = &decode.Group{Name: "msdos_stub"}
 	MsgPack             = &decode.Group{Name: "msgpack"}
 	NES                 = &decode.Group{Name: "nes"}
 	Ogg                 = &decode.Group{Name: "ogg"}
@@ -153,6 +155,7 @@ var (
 	Opus_Packet         = &decode.Group{Name: "opus_packet"}
 	PCAP                = &decode.Group{Name: "pcap"}
 	PCAPNG              = &decode.Group{Name: "pcapng"}
+	PE                  = &decode.Group{Name: "pe"}
 	Pg_BTree            = &decode.Group{Name: "pg_btree"}
 	Pg_Control          = &decode.Group{Name: "pg_control"}
 	Pg_Heap             = &decode.Group{Name: "pg_heap"}
@@ -403,3 +406,11 @@ type Pg_Heap_In struct {
 type Pg_BTree_In struct {
 	Page int `doc:"First page number in file, default is 0"`
 }
+
+type MS_DOS_Out struct {
+	LFANew int // logical file address for the New Executable header
+}
+
+type COFF_In struct {
+	FilePointerOffset int `doc:"File pointer offset"`
+}
diff --git a/format/mpeg/mpeg_pes.go b/format/mpeg/mpeg_pes.go
@@ -16,7 +16,7 @@ var mpegSpuGroup decode.Group
 
 func init() {
 	interp.RegisterFormat(
-		format.MPES_PES,
+		format.MPEG_PES,
 		&decode.Format{
 			Description: "MPEG Packetized elementary stream",
 			DecodeFn:    pesDecode,