From 3deceeebd6d3bf8a036bc08f12c714082e8891ea Mon Sep 17 00:00:00 2001 From: David McDonald Date: Fri, 23 Sep 2022 20:21:25 -0500 Subject: [PATCH] fixes from PR comments --- format/bplist/bplist.go | 2 +- format/bplist/bplist.jq | 2 +- format/bplist/bplist.md | 28 ++-------------------------- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/format/bplist/bplist.go b/format/bplist/bplist.go index fe1348ed1..eb4889366 100644 --- a/format/bplist/bplist.go +++ b/format/bplist/bplist.go @@ -214,7 +214,7 @@ func bplistDecode(d *decode.D, _ any) any { d.SeekAbs(d.Len()-32*8, func(d *decode.D) { d.FieldStruct("trailer", func(d *decode.D) { - d.FieldU40("padding") // unused + d.FieldU40("unused") d.FieldS8("sort_version") p.t.offTblOffSize = d.FieldU8("offset_table_offset_size", d.AssertURange(1, 8)) p.t.objRefSize = d.FieldU8("object_reference_size", d.AssertURange(1, 8)) diff --git a/format/bplist/bplist.jq b/format/bplist/bplist.jq index 3fb12eb6c..ee41ac68b 100644 --- a/format/bplist/bplist.jq +++ b/format/bplist/bplist.jq @@ -26,5 +26,5 @@ def _bplist_torepr: ); ( .objects | _f - ); + ); diff --git a/format/bplist/bplist.md b/format/bplist/bplist.md index aee8a8e33..67d0a3380 100644 --- a/format/bplist/bplist.md +++ b/format/bplist/bplist.md @@ -1,36 +1,12 @@ ### Show full decoding ```sh $ fq -d bplist dv Info.plist - - |00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f|0123456789abcdef|.{}: testdata/Info.plist (bplist) 0x0-0x983.7 (2436) - | | | header{}: 0x0-0x7.7 (8) -0x000|62 70 6c 69 73 74 |bplist | magic: "bplist" (valid) 0x0-0x5.7 (6) -0x000| 30 30 | 00 | version: "00" (valid) 0x6-0x7.7 (2) - | | | objects{}: 0x8-0x87f.7 (2168) -0x000| df | . | type: "dict" (13) (Dictionary) 0x8-0x8.3 (0.4) -0x000| df | . | size_bits: 15 0x8.4-0x8.7 (0.4) -0x000| 10 | . | large_size_marker: 1 (valid) 0x9-0x9.3 (0.4) -0x000| 10 | . | exponent: 0 0x9.4-0x9.7 (0.4) -0x000| 16 | . | size_bigint: 22 0xa-0xa.7 (1) - | | | size: 22 0xb-NA (0) - | | | entries[0:22]: 0xb-0x87f.7 (2165) - | | | [0]{}: entry 0xb-0x207.7 (509) -0x000| 01 | . | key_index: 1 0xb-0xb.7 (1) -0x020| 17 | . | value_index: 23 0x21-0x21.7 (1) - | | | key{}: 0x37-0x43.7 (13) -0x030| 5c | \ | type: "ascii_string" (5) (ASCII encoded string) 0x37-0x37.3 (0.4) -0x030| 5c | \ | size_bits: 12 0x37.4-0x37.7 (0.4) - | | | size: 12 0x38-NA (0) -0x030| 43 46 42 75 6e 64 6c 65| CFBundle| value: "CFBundleName" 0x38-0x43.7 (12) - -... - -... ``` ### Get JSON representation ``` -$ fq '. | torepr' com.apple.UIAutomation.plist +$ fq torepr com.apple.UIAutomation.plist + { "UIAutomationEnabled": true }