fstool 0.4.12

Build disk images and filesystems (ext2/3/4, MBR, GPT) from a directory tree and TOML spec, in the spirit of genext2fs.
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
1027
1028
1029
1030
1031
1032
1033
1034
1035
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
1047
1048
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
1066
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
1125
1126
1127
1128
1129
1130
1131
1132
1133
1134
1135
1136
1137
1138
1139
1140
1141
1142
1143
1144
1145
1146
1147
1148
1149
1150
1151
1152
1153
1154
1155
1156
1157
1158
1159
1160
1161
1162
1163
1164
1165
1166
1167
1168
1169
1170
1171
1172
1173
1174
1175
1176
1177
1178
1179
1180
1181
1182
1183
1184
1185
1186
1187
1188
1189
1190
1191
1192
1193
1194
1195
1196
1197
1198
1199
1200
1201
1202
1203
1204
1205
1206
1207
1208
1209
1210
1211
1212
1213
1214
1215
1216
1217
1218
1219
1220
1221
1222
1223
1224
1225
1226
1227
1228
1229
1230
1231
1232
1233
1234
1235
1236
1237
1238
1239
1240
1241
1242
1243
1244
1245
1246
1247
1248
1249
1250
1251
1252
1253
1254
1255
1256
1257
1258
1259
1260
1261
1262
1263
1264
1265
1266
1267
1268
1269
1270
1271
1272
1273
1274
1275
1276
1277
1278
1279
1280
1281
1282
1283
1284
1285
1286
1287
1288
1289
1290
1291
1292
1293
1294
1295
1296
1297
//! Classic **HFS** (Hierarchical File System, Mac OS ≤ 8 / System ≤ 8) —
//! read-only reader.
//!
//! Distinct from HFS+ (`src/fs/hfs_plus/`): classic HFS uses 512-byte B-tree
//! nodes, MacRoman Pascal names (≤ 31 chars), 16-bit allocation-block addressing
//! and a Master Directory Block (MDB) at volume offset 1024 with signature
//! `BD` (0x4244). Recognised by `detect_fs`; commonly found inside DiskCopy 4.2
//! images (see `src/block/diskcopy.rs`), which this reader sees transparently.
//!
//! Strategy: classic HFS volumes are small (floppies / small disks), so at
//! `open` we read the whole catalog + extents-overflow B-trees into memory and
//! build a parent→children map. That sidesteps HFS's exact key-ordering table
//! (we match names by case-insensitive scan, never by B-tree key comparison)
//! and keeps `list`/`cat` simple. Both the **data fork** and the **resource
//! fork** are readable: the data fork is the file body, and the resource fork
//! is reached via `open_resource_fork_reader` and surfaced as the
//! `com.apple.ResourceFork` xattr (see also the `resfork` parser).

use crate::macroman;

mod writer;
pub use writer::HfsFormatOpts;

use std::collections::HashMap;
use std::io::{self, Read, Seek, SeekFrom};
use std::path::Path;

use crate::block::BlockDevice;
use crate::fs::{DirEntry, EntryKind, FileAttrs, Filesystem, MutationCapability};
use crate::{Error, Result};

/// HFS MDB lives two 512-byte sectors into the volume.
const MDB_OFFSET: u64 = 1024;
/// Classic HFS B-tree node size is fixed at 512 bytes.
const NODE_SIZE: usize = 512;
/// Root directory CNID.
const ROOT_CNID: u32 = 2;
/// Seconds between the Mac (1904) and Unix (1970) epochs.
const MAC_EPOCH_DELTA: u32 = 2_082_844_800;
/// Cap on the catalog / extents file sizes we'll buffer in RAM.
const MAX_TREE_BYTES: u64 = 64 * 1024 * 1024;

#[inline]
fn be16(b: &[u8], o: usize) -> u16 {
    u16::from_be_bytes([b[o], b[o + 1]])
}
#[inline]
fn be32(b: &[u8], o: usize) -> u32 {
    u32::from_be_bytes([b[o], b[o + 1], b[o + 2], b[o + 3]])
}
#[inline]
fn round_up_even(x: usize) -> usize {
    (x + 1) & !1
}

/// A fork's first three (inline) extent descriptors: `(startBlock, blockCount)`.
type ExtRec = [(u16, u16); 3];

fn ext_rec(b: &[u8], o: usize) -> ExtRec {
    [
        (be16(b, o), be16(b, o + 2)),
        (be16(b, o + 4), be16(b, o + 6)),
        (be16(b, o + 8), be16(b, o + 10)),
    ]
}

/// One indexed catalog entry (a child of some directory).
struct Node {
    name: String,
    cnid: u32,
    is_dir: bool,
    /// Data-fork logical size (files only).
    size: u64,
    mtime: u32,
    /// Data-fork inline extents (files only).
    inline: ExtRec,
    /// Resource-fork logical size (files only; 0 when absent).
    rsrc_size: u64,
    /// Resource-fork inline extents (files only).
    rsrc_inline: ExtRec,
}

/// Classic HFS volume. Read-only when opened via [`Hfs::open`]; gains write
/// capability (the `writer` is `Some`) after [`Hfs::format`] (and, in a later
/// phase, an in-place writable open).
pub struct Hfs {
    /// Allocation block size in bytes (`drAlBlkSiz`).
    block_size: u32,
    /// Byte offset of allocation block 0 (`drAlBlSt` × 512).
    alloc_base: u64,
    /// Volume name (`drVN`, MacRoman-decoded).
    pub volume_name: String,
    /// parentCNID → children. The read index; kept in sync with `writer`'s
    /// catalog after each mutation.
    children: HashMap<u32, Vec<Node>>,
    /// Extents-overflow map: (forkType, CNID, startBlock) → 3 extents.
    overflow: HashMap<(u8, u32, u16), ExtRec>,
    /// Present (and authoritative for mutation) when the volume is writable.
    writer: Option<writer::HfsWriter>,
}

impl Hfs {
    pub fn open(dev: &mut dyn BlockDevice) -> Result<Self> {
        let dev_len = dev.total_size();
        if dev_len < MDB_OFFSET + 512 {
            return Err(Error::InvalidImage(
                "hfs: device too small for an MDB".into(),
            ));
        }
        let mut m = [0u8; 512];
        dev.read_at(MDB_OFFSET, &mut m)?;
        if &m[0..2] != b"BD" {
            return Err(Error::InvalidImage(
                "hfs: bad MDB signature (expected BD)".into(),
            ));
        }
        // An HFS volume that merely *wraps* an embedded HFS+ volume has
        // `drEmbedSigWord` == 'H+'. That belongs to the HFS+ reader, not here.
        if be16(&m, 0x7C) == 0x482B {
            return Err(Error::Unsupported(
                "hfs: HFS-wrapped HFS+ volume is not supported (embedded H+)".into(),
            ));
        }

        let block_size = be32(&m, 20);
        let al_bl_st = be16(&m, 28) as u64;
        if block_size == 0 || !block_size.is_multiple_of(512) {
            return Err(Error::InvalidImage(format!(
                "hfs: bad allocation block size {block_size}"
            )));
        }
        let alloc_base = al_bl_st * 512;

        // Volume name: Str27 at offset 36 (length byte + chars).
        let vn_len = (m[36] as usize).min(27);
        let volume_name = macroman::decode(&m[37..37 + vn_len]);

        // Special files: extents-overflow (CNID 3) and catalog (CNID 4).
        let xt_size = be32(&m, 130) as u64;
        let xt_ext = ext_rec(&m, 134);
        let ct_size = be32(&m, 146) as u64;
        let ct_ext = ext_rec(&m, 150);
        for (sz, what) in [(xt_size, "extents"), (ct_size, "catalog")] {
            if sz > MAX_TREE_BYTES || sz > dev_len {
                return Err(Error::InvalidImage(format!(
                    "hfs: {what} file size {sz} is implausible"
                )));
            }
        }

        let mut hfs = Hfs {
            block_size,
            alloc_base,
            volume_name,
            children: HashMap::new(),
            overflow: HashMap::new(),
            writer: None,
        };

        // 1) Read the extents-overflow file (inline extents only — it can't
        //    reference itself) and build the overflow map.
        let xt_bytes = hfs.read_fork(dev, &xt_ext, xt_size, dev_len)?;
        hfs.build_overflow(&xt_bytes)?;

        // 2) Read the catalog file (inline + overflow for CNID 4) and build the
        //    parent→children map.
        let cat_ext = hfs.full_extents(4, 0, &ct_ext, ct_size);
        let cat_bytes = hfs.read_fork(dev, &cat_ext, ct_size, dev_len)?;
        hfs.build_catalog(&cat_bytes)?;

        Ok(hfs)
    }

    /// Byte ranges (`(device offset, length)`) covering `extents`, capped at
    /// `logical` bytes, bounds-checked against the device.
    fn fork_ranges(
        &self,
        extents: &[(u16, u16)],
        logical: u64,
        dev_len: u64,
    ) -> Result<Vec<(u64, u64)>> {
        let mut out = Vec::new();
        let mut acc = 0u64;
        for &(sb, bc) in extents {
            if bc == 0 || acc >= logical {
                continue;
            }
            let off = self
                .alloc_base
                .checked_add(sb as u64 * self.block_size as u64)
                .ok_or_else(|| Error::InvalidImage("hfs: extent offset overflow".into()))?;
            let mut len = bc as u64 * self.block_size as u64;
            if acc + len > logical {
                len = logical - acc;
            }
            if off.checked_add(len).is_none_or(|e| e > dev_len) {
                return Err(Error::InvalidImage("hfs: extent past end of device".into()));
            }
            out.push((off, len));
            acc += len;
        }
        Ok(out)
    }

    /// Read a fork fully into memory (used for the small catalog/extents files).
    fn read_fork(
        &self,
        dev: &mut dyn BlockDevice,
        extents: &[(u16, u16)],
        logical: u64,
        dev_len: u64,
    ) -> Result<Vec<u8>> {
        let ranges = self.fork_ranges(extents, logical, dev_len)?;
        let mut out = vec![0u8; logical as usize];
        let mut pos = 0usize;
        for (off, len) in ranges {
            let len = len as usize;
            dev.read_at(off, &mut out[pos..pos + len])?;
            pos += len;
        }
        Ok(out)
    }

    /// Chase the extents-overflow chain to gather all extents of a fork.
    fn full_extents(
        &self,
        cnid: u32,
        fork_type: u8,
        inline: &ExtRec,
        logical: u64,
    ) -> Vec<(u16, u16)> {
        let mut exts: Vec<(u16, u16)> = inline.iter().copied().filter(|&(_, c)| c != 0).collect();
        let mut covered: u32 = exts.iter().map(|&(_, c)| c as u32).sum();
        let need = logical.div_ceil(self.block_size.max(1) as u64) as u32;
        let mut guard = 0u32;
        while covered < need {
            guard += 1;
            if guard > 8192 {
                break;
            }
            let Some(rec) = self.overflow.get(&(fork_type, cnid, covered as u16)) else {
                break;
            };
            let mut progressed = false;
            for &(s, c) in rec {
                if c != 0 {
                    exts.push((s, c));
                    covered += c as u32;
                    progressed = true;
                }
            }
            if !progressed {
                break;
            }
        }
        exts
    }

    /// Walk every leaf record of a B-tree buffer, calling `f(key, data)`.
    fn walk_leaves<F>(buf: &[u8], mut f: F) -> Result<()>
    where
        F: FnMut(&[u8], &[u8]) -> Result<()>,
    {
        if buf.len() < NODE_SIZE {
            return Ok(());
        }
        // Header node (node 0) record 0 = BTHdrRec; bthFNode @ +24 within node.
        let first_leaf = be32(buf, 24);
        let n_nodes = be32(buf, 36);
        let total_nodes = (buf.len() / NODE_SIZE) as u32;

        let mut node_idx = first_leaf;
        let mut steps = n_nodes.min(total_nodes).max(1) as u64 + 1;
        while node_idx != 0 {
            if steps == 0 {
                return Err(Error::InvalidImage("hfs: B-tree leaf chain cycle".into()));
            }
            steps -= 1;
            if node_idx >= total_nodes {
                return Err(Error::InvalidImage(
                    "hfs: leaf node index out of range".into(),
                ));
            }
            let start = node_idx as usize * NODE_SIZE;
            let node = &buf[start..start + NODE_SIZE];
            let flink = be32(node, 0);
            let ntype = node[8];
            let nrecs = be16(node, 10) as usize;
            if ntype != 0xFF {
                break; // not a leaf node — chain ended
            }
            for i in 0..nrecs {
                let lo = NODE_SIZE - 2 * (i + 1);
                let o = be16(node, lo) as usize;
                let o2 = be16(node, lo - 2) as usize;
                if o < 14 || o2 > NODE_SIZE || o >= o2 {
                    continue;
                }
                let rec = &node[o..o2];
                let key_len = rec[0] as usize;
                let key_total = round_up_even(1 + key_len);
                if 1 + key_len > rec.len() || key_total > rec.len() {
                    continue;
                }
                f(&rec[1..1 + key_len], &rec[key_total..])?;
            }
            node_idx = flink;
        }
        Ok(())
    }

    fn build_overflow(&mut self, buf: &[u8]) -> Result<()> {
        let mut map = HashMap::new();
        Self::walk_leaves(buf, |key, data| {
            // Extents key: forkType(1), fileNum(4), startBlock(2).
            if key.len() < 7 || data.len() < 12 {
                return Ok(());
            }
            let fork_type = key[0];
            let cnid = be32(key, 1);
            let start_abn = be16(key, 5);
            map.insert((fork_type, cnid, start_abn), ext_rec(data, 0));
            Ok(())
        })?;
        self.overflow = map;
        Ok(())
    }

    fn build_catalog(&mut self, buf: &[u8]) -> Result<()> {
        let mut children: HashMap<u32, Vec<Node>> = HashMap::new();
        Self::walk_leaves(buf, |key, data| {
            // Catalog key: reserved(1), parentID(4), name (Pascal MacRoman).
            if key.len() < 6 || data.is_empty() {
                return Ok(());
            }
            let parent = be32(key, 1);
            let name_len = (key[5] as usize).min(31);
            if 6 + name_len > key.len() {
                return Ok(());
            }
            // Classic HFS uses `:` as the path separator, so `/` (0x2F) is a
            // *legal* character inside a filename (e.g. "A/ROSE Includes").
            // fstool — like every POSIX tool — separates path components with
            // `/`, so a raw `/` in a name would be mis-split. Swap it to `:`,
            // exactly as macOS's own BSD layer does when surfacing HFS names
            // (Finder shows `/`, the shell shows `:`). `:` itself can never
            // appear in a raw HFS name, so the mapping is unambiguous.
            let name = macroman::decode(&key[6..6 + name_len]).replace('/', ":");

            match data[0] {
                1 if data.len() >= 18 => {
                    // Directory record: dirDirID @ +6, dirMdDat @ +14.
                    children.entry(parent).or_default().push(Node {
                        name,
                        cnid: be32(data, 6),
                        is_dir: true,
                        size: 0,
                        mtime: be32(data, 14),
                        inline: [(0, 0); 3],
                        rsrc_size: 0,
                        rsrc_inline: [(0, 0); 3],
                    });
                }
                2 if data.len() >= 98 => {
                    // File record (after cdrType + cdrResrv2 at @0/@1):
                    // filFlNum @ +20, filLgLen (data fork) @ +26, filRLgLen
                    // (resource fork) @ +36, filMdDat @ +48, data-fork filExtRec
                    // @ +74, resource-fork filRExtRec @ +86.
                    children.entry(parent).or_default().push(Node {
                        name,
                        cnid: be32(data, 20),
                        is_dir: false,
                        size: be32(data, 26) as u64,
                        mtime: be32(data, 48),
                        inline: ext_rec(data, 74),
                        rsrc_size: be32(data, 36) as u64,
                        rsrc_inline: ext_rec(data, 86),
                    });
                }
                _ => {} // thread records (3/4) and anything else: ignore
            }
            Ok(())
        })?;
        self.children = children;
        Ok(())
    }

    /// Resolve a slash path to a catalog node (and its parent CNID for `/`).
    fn resolve(&self, path: &str) -> Option<Resolved<'_>> {
        let mut cnid = ROOT_CNID;
        let comps: Vec<&str> = path.split('/').filter(|c| !c.is_empty()).collect();
        if comps.is_empty() {
            return Some(Resolved::Dir(ROOT_CNID));
        }
        for (i, comp) in comps.iter().enumerate() {
            let kids = self.children.get(&cnid)?;
            let node = kids
                .iter()
                .find(|n| macroman::eq_ignore_case(&n.name, comp))?;
            let last = i + 1 == comps.len();
            if node.is_dir {
                cnid = node.cnid;
                if last {
                    return Some(Resolved::Dir(node.cnid));
                }
            } else if last {
                return Some(Resolved::File(node));
            } else {
                return None; // a file in the middle of the path
            }
        }
        Some(Resolved::Dir(cnid))
    }

    pub fn list_path(&self, path: &str) -> Result<Vec<DirEntry>> {
        let cnid = match self.resolve(path) {
            Some(Resolved::Dir(c)) => c,
            Some(Resolved::File(_)) => {
                return Err(Error::InvalidArgument(format!(
                    "hfs: {path:?} is not a directory"
                )));
            }
            None => {
                return Err(Error::InvalidArgument(format!(
                    "hfs: no such path {path:?}"
                )));
            }
        };
        let mut out = Vec::new();
        if let Some(kids) = self.children.get(&cnid) {
            for n in kids {
                out.push(DirEntry {
                    name: n.name.clone(),
                    inode: n.cnid,
                    kind: if n.is_dir {
                        EntryKind::Dir
                    } else {
                        EntryKind::Regular
                    },
                    size: n.size,
                });
            }
        }
        Ok(out)
    }

    pub fn open_file_reader<'a>(
        &self,
        dev: &'a mut dyn BlockDevice,
        path: &str,
    ) -> Result<HfsFileReader<'a>> {
        let (cnid, size, inline) = match self.resolve(path) {
            Some(Resolved::File(n)) => (n.cnid, n.size, n.inline),
            Some(Resolved::Dir(_)) => {
                return Err(Error::InvalidArgument(format!(
                    "hfs: {path:?} is a directory"
                )));
            }
            None => {
                return Err(Error::InvalidArgument(format!(
                    "hfs: no such file {path:?}"
                )));
            }
        };
        let dev_len = dev.total_size();
        let extents = self.full_extents(cnid, 0, &inline, size);
        let ranges = self.fork_ranges(&extents, size, dev_len)?;
        Ok(HfsFileReader {
            dev,
            ranges,
            total: size,
            pos: 0,
        })
    }

    /// Open a streaming reader over a file's **resource fork** (fork type
    /// `0xFF`). Reuses the same extent machinery as the data fork. Errors if the
    /// path is a directory, doesn't exist, or the file has no resource fork.
    pub fn open_resource_fork_reader<'a>(
        &self,
        dev: &'a mut dyn BlockDevice,
        path: &str,
    ) -> Result<HfsFileReader<'a>> {
        let (cnid, size, inline) = match self.resolve(path) {
            Some(Resolved::File(n)) => (n.cnid, n.rsrc_size, n.rsrc_inline),
            Some(Resolved::Dir(_)) => {
                return Err(Error::InvalidArgument(format!(
                    "hfs: {path:?} is a directory"
                )));
            }
            None => {
                return Err(Error::InvalidArgument(format!(
                    "hfs: no such file {path:?}"
                )));
            }
        };
        if size == 0 {
            return Err(Error::InvalidArgument(format!(
                "hfs: {path:?} has no resource fork"
            )));
        }
        let dev_len = dev.total_size();
        let extents = self.full_extents(cnid, 0xFF, &inline, size);
        let ranges = self.fork_ranges(&extents, size, dev_len)?;
        Ok(HfsFileReader {
            dev,
            ranges,
            total: size,
            pos: 0,
        })
    }

    /// Resource-fork logical size for `path`, or `None` if the path is not a
    /// file or has an empty resource fork.
    pub fn resource_fork_size(&self, path: &str) -> Option<u64> {
        match self.resolve(path) {
            Some(Resolved::File(n)) if n.rsrc_size > 0 => Some(n.rsrc_size),
            _ => None,
        }
    }

    /// Format a fresh, empty, **writable** classic-HFS volume on `dev`.
    pub fn format(dev: &mut dyn BlockDevice, opts: &writer::HfsFormatOpts) -> Result<Self> {
        let w = writer::HfsWriter::format(dev, opts)?;
        Ok(Self::from_writer(w))
    }

    /// Open an existing classic-HFS volume **for in-place mutation**: load its
    /// catalog (including thread records) and extents-overflow into the writer's
    /// in-memory maps plus the volume bitmap, so `create_*`/`remove`/`flush`
    /// work on it.
    pub fn open_writable(dev: &mut dyn BlockDevice) -> Result<Self> {
        let ro = Hfs::open(dev)?;
        let dev_len = dev.total_size();
        let total_sectors = dev_len / 512;
        let mut m = [0u8; 512];
        dev.read_at(MDB_OFFSET, &mut m)?;

        let block_size = be32(&m, 20);
        let vbm_start = be16(&m, 14) as u64;
        let total_blocks = be16(&m, 18);
        let free_blocks = be16(&m, 34);
        let next_cnid = be32(&m, 30).max(16);
        let cat_ext = ext_rec(&m, 150);
        let cat_size = be32(&m, 146);
        let xt_ext = ext_rec(&m, 134);
        let xt_size = be32(&m, 130);

        // Volume bitmap (one read covering all the block bits).
        let mut bitmap = vec![0u8; (total_blocks as usize).div_ceil(8)];
        dev.read_at(vbm_start * 512, &mut bitmap)?;

        // Walk the catalog, capturing every record (file/dir/thread) by key.
        let cat_extents = ro.full_extents(4, 0, &cat_ext, cat_size as u64);
        let cat_bytes = ro.read_fork(dev, &cat_extents, cat_size as u64, dev_len)?;
        let mut catalog = std::collections::BTreeMap::new();
        Self::walk_leaves(&cat_bytes, |key, data| {
            if key.len() < 6 || data.is_empty() {
                return Ok(());
            }
            let parid = be32(key, 1);
            let name_len = (key[5] as usize).min(31);
            if 6 + name_len > key.len() {
                return Ok(());
            }
            catalog.insert(
                writer::OwnedKey {
                    parid,
                    name: key[6..6 + name_len].to_vec(),
                },
                data.to_vec(),
            );
            Ok(())
        })?;

        // The read-only open already parsed the extents-overflow records.
        let overflow: std::collections::BTreeMap<_, _> =
            ro.overflow.iter().map(|(&k, &v)| (k, v)).collect();

        let w = writer::HfsWriter::adopt(
            block_size,
            ro.alloc_base,
            vbm_start,
            total_blocks,
            total_sectors,
            bitmap,
            free_blocks,
            next_cnid,
            catalog,
            overflow,
            ro.volume_name.clone(),
            be32(&m, 2),
            cat_ext,
            cat_size,
            xt_ext,
            xt_size,
        );
        Ok(Self::from_writer(w))
    }

    /// Build a writable `Hfs` around an [`writer::HfsWriter`], seeding the read
    /// index from its catalog.
    fn from_writer(w: writer::HfsWriter) -> Self {
        let mut hfs = Hfs {
            block_size: w.block_size,
            alloc_base: w.alloc_base,
            volume_name: w.volume_name.clone(),
            children: HashMap::new(),
            overflow: HashMap::new(),
            writer: Some(w),
        };
        hfs.rebuild_index();
        hfs
    }

    /// Rebuild the read index (`children` / `overflow`) from the writer's
    /// in-memory catalog, so `list`/`cat` reflect pending mutations. Cheap on
    /// the small volumes classic HFS targets.
    fn rebuild_index(&mut self) {
        let Some(w) = self.writer.as_ref() else {
            return;
        };
        let mut children: HashMap<u32, Vec<Node>> = HashMap::new();
        for (key, body) in &w.catalog {
            if body.is_empty() {
                continue;
            }
            let name = macroman::decode(&key.name).replace('/', ":");
            match body[0] {
                1 if body.len() >= 18 => {
                    children.entry(key.parid).or_default().push(Node {
                        name,
                        cnid: be32(body, 6),
                        is_dir: true,
                        size: 0,
                        mtime: be32(body, 14),
                        inline: [(0, 0); 3],
                        rsrc_size: 0,
                        rsrc_inline: [(0, 0); 3],
                    });
                }
                2 if body.len() >= 98 => {
                    children.entry(key.parid).or_default().push(Node {
                        name,
                        cnid: be32(body, 20),
                        is_dir: false,
                        size: be32(body, 26) as u64,
                        mtime: be32(body, 48),
                        inline: ext_rec(body, 74),
                        rsrc_size: be32(body, 36) as u64,
                        rsrc_inline: ext_rec(body, 86),
                    });
                }
                _ => {}
            }
        }
        self.children = children;
        self.overflow = w.overflow.iter().map(|(&k, &v)| (k, v)).collect();
    }
}

enum Resolved<'a> {
    Dir(u32),
    File(&'a Node),
}

/// Streaming reader over a file's data fork (extent byte ranges).
pub struct HfsFileReader<'a> {
    dev: &'a mut dyn BlockDevice,
    ranges: Vec<(u64, u64)>,
    total: u64,
    pos: u64,
}

impl HfsFileReader<'_> {
    /// Map a logical position to `(device offset, bytes available in extent)`.
    fn locate(&self, pos: u64) -> Option<(u64, u64)> {
        let mut walked = 0u64;
        for &(off, len) in &self.ranges {
            if pos < walked + len {
                let within = pos - walked;
                return Some((off + within, len - within));
            }
            walked += len;
        }
        None
    }
}

impl Read for HfsFileReader<'_> {
    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
        if self.pos >= self.total || buf.is_empty() {
            return Ok(0);
        }
        let (off, avail) = match self.locate(self.pos) {
            Some(v) => v,
            None => return Ok(0),
        };
        let want = (buf.len() as u64).min(avail).min(self.total - self.pos) as usize;
        self.dev
            .read_at(off, &mut buf[..want])
            .map_err(io::Error::other)?;
        self.pos += want as u64;
        Ok(want)
    }
}

impl Seek for HfsFileReader<'_> {
    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
        let new = match pos {
            SeekFrom::Start(n) => n as i128,
            SeekFrom::End(d) => self.total as i128 + d as i128,
            SeekFrom::Current(d) => self.pos as i128 + d as i128,
        };
        if new < 0 {
            return Err(io::Error::new(
                io::ErrorKind::InvalidInput,
                "hfs: seek before start",
            ));
        }
        self.pos = new as u64;
        Ok(self.pos)
    }
}

impl crate::fs::FileReadHandle for HfsFileReader<'_> {
    fn len(&self) -> u64 {
        self.total
    }
}

impl crate::fs::FilesystemFactory for Hfs {
    type FormatOpts = writer::HfsFormatOpts;
    fn format(dev: &mut dyn BlockDevice, opts: &Self::FormatOpts) -> Result<Self> {
        Self::format(dev, opts)
    }
    fn open(dev: &mut dyn BlockDevice) -> Result<Self> {
        Self::open(dev)
    }
}

impl Filesystem for Hfs {
    fn create_file(
        &mut self,
        dev: &mut dyn BlockDevice,
        path: &Path,
        src: crate::fs::FileSource,
        meta: crate::fs::FileMeta,
    ) -> Result<()> {
        let s = path
            .to_str()
            .ok_or_else(|| Error::InvalidArgument("hfs: non-UTF-8 path".into()))?;
        let w = self.writer.as_mut().ok_or(Error::Immutable {
            kind: "hfs",
            op: "add",
        })?;
        let len = src.len()?;
        let (mut reader, _) = src.open()?;
        w.insert_file(dev, s, &mut reader, len, meta.mtime)?;
        self.rebuild_index();
        Ok(())
    }

    fn create_dir(
        &mut self,
        _dev: &mut dyn BlockDevice,
        path: &Path,
        meta: crate::fs::FileMeta,
    ) -> Result<()> {
        let s = path
            .to_str()
            .ok_or_else(|| Error::InvalidArgument("hfs: non-UTF-8 path".into()))?;
        let w = self.writer.as_mut().ok_or(Error::Immutable {
            kind: "hfs",
            op: "mkdir",
        })?;
        w.insert_dir(s, meta.mtime)?;
        self.rebuild_index();
        Ok(())
    }

    fn create_symlink(
        &mut self,
        _dev: &mut dyn BlockDevice,
        _path: &Path,
        _target: &Path,
        _meta: crate::fs::FileMeta,
    ) -> Result<()> {
        // Classic HFS has no POSIX symlinks; the repack sink treats this as a
        // skippable entry.
        Err(Error::Unsupported(
            "hfs: classic HFS has no symbolic links".into(),
        ))
    }

    fn create_device(
        &mut self,
        _dev: &mut dyn BlockDevice,
        _path: &Path,
        _kind: crate::fs::DeviceKind,
        _major: u32,
        _minor: u32,
        _meta: crate::fs::FileMeta,
    ) -> Result<()> {
        Err(Error::Immutable {
            kind: "hfs",
            op: "mknod",
        })
    }

    fn remove(&mut self, _dev: &mut dyn BlockDevice, path: &Path) -> Result<()> {
        let s = path
            .to_str()
            .ok_or_else(|| Error::InvalidArgument("hfs: non-UTF-8 path".into()))?;
        let w = self.writer.as_mut().ok_or(Error::Immutable {
            kind: "hfs",
            op: "rm",
        })?;
        w.remove(s)?;
        self.rebuild_index();
        Ok(())
    }

    fn list(&mut self, _dev: &mut dyn BlockDevice, path: &Path) -> Result<Vec<DirEntry>> {
        let s = path
            .to_str()
            .ok_or_else(|| Error::InvalidArgument("hfs: non-UTF-8 path".into()))?;
        self.list_path(s)
    }

    fn read_file<'a>(
        &'a mut self,
        dev: &'a mut dyn BlockDevice,
        path: &Path,
    ) -> Result<Box<dyn Read + 'a>> {
        let s = path
            .to_str()
            .ok_or_else(|| Error::InvalidArgument("hfs: non-UTF-8 path".into()))?;
        Ok(Box::new(self.open_file_reader(dev, s)?))
    }

    fn open_file_ro<'a>(
        &'a mut self,
        dev: &'a mut dyn BlockDevice,
        path: &Path,
    ) -> Result<Box<dyn crate::fs::FileReadHandle + 'a>> {
        let s = path
            .to_str()
            .ok_or_else(|| Error::InvalidArgument("hfs: non-UTF-8 path".into()))?;
        Ok(Box::new(self.open_file_reader(dev, s)?))
    }

    fn getattr(&mut self, _dev: &mut dyn BlockDevice, path: &Path) -> Result<FileAttrs> {
        let s = path
            .to_str()
            .ok_or_else(|| Error::InvalidArgument("hfs: non-UTF-8 path".into()))?;
        let (kind, size, mtime, inode) = match self.resolve(s) {
            Some(Resolved::Dir(cnid)) => (EntryKind::Dir, 0u64, 0u32, cnid),
            Some(Resolved::File(n)) => (EntryKind::Regular, n.size, n.mtime, n.cnid),
            None => return Err(Error::InvalidArgument(format!("hfs: no such path {s:?}"))),
        };
        let mtime = mtime.saturating_sub(MAC_EPOCH_DELTA);
        Ok(FileAttrs {
            kind,
            mode: if kind == EntryKind::Dir { 0o755 } else { 0o644 },
            uid: 0,
            gid: 0,
            size,
            blocks: size.div_ceil(512),
            nlink: if kind == EntryKind::Dir { 2 } else { 1 },
            atime: mtime,
            mtime,
            ctime: mtime,
            rdev: 0,
            inode,
        })
    }

    fn flush(&mut self, dev: &mut dyn BlockDevice) -> Result<()> {
        if let Some(w) = self.writer.as_mut() {
            w.flush(dev)?;
            self.rebuild_index();
        }
        Ok(())
    }

    /// Surface a file's resource fork as the macOS-standard
    /// `com.apple.ResourceFork` extended attribute (read-only, capped at
    /// 16 MiB), so it appears in `info` and is carried through `repack`/`add`
    /// to xattr-capable destinations — exactly how macOS `ditto`/`cp -p`
    /// preserve resource forks. Files without a resource fork yield no xattrs.
    fn list_xattrs(
        &mut self,
        dev: &mut dyn BlockDevice,
        path: &Path,
    ) -> Result<Vec<crate::fs::XattrPair>> {
        let s = path
            .to_str()
            .ok_or_else(|| Error::InvalidArgument("hfs: non-UTF-8 path".into()))?;
        if self.resource_fork_size(s).is_none() {
            return Ok(Vec::new());
        }
        const CAP: u64 = 16 * 1024 * 1024;
        let r = self.open_resource_fork_reader(dev, s)?;
        let mut buf = Vec::new();
        r.take(CAP).read_to_end(&mut buf)?;
        Ok(vec![crate::fs::XattrPair {
            name: "com.apple.ResourceFork".into(),
            value: buf,
        }])
    }

    fn mutation_capability(&self) -> MutationCapability {
        if self.writer.is_some() {
            MutationCapability::Mutable
        } else {
            MutationCapability::Immutable
        }
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::block::MemoryBackend;

    const HELLO: &[u8] = b"Hello from classic HFS!\n";
    const DEEP: &[u8] = b"Deep file in sub.\n";
    const RSRC: &[u8] = b"resource fork payload bytes\n";

    fn put_u16(v: &mut [u8], o: usize, x: u16) {
        v[o..o + 2].copy_from_slice(&x.to_be_bytes());
    }
    fn put_u32(v: &mut [u8], o: usize, x: u32) {
        v[o..o + 4].copy_from_slice(&x.to_be_bytes());
    }
    fn put_ext(v: &mut [u8], o: usize, e: &[(u16, u16)]) {
        for (i, &(s, c)) in e.iter().enumerate() {
            put_u16(v, o + i * 4, s);
            put_u16(v, o + i * 4 + 2, c);
        }
    }

    fn file_record(cnid: u32, size: u32, start_block: u16) -> Vec<u8> {
        let mut d = vec![0u8; 102];
        d[0] = 2; // cdrType = file (cdrResrv2 @1)
        d[4..8].copy_from_slice(b"TEXT"); // FInfo fdType
        d[8..12].copy_from_slice(b"ttxt"); // FInfo fdCreator
        d[20..24].copy_from_slice(&cnid.to_be_bytes()); // filFlNum
        d[26..30].copy_from_slice(&size.to_be_bytes()); // filLgLen (data fork)
        d[30..34].copy_from_slice(&512u32.to_be_bytes()); // filPyLen (1 block)
        put_ext(&mut d, 74, &[(start_block, 1), (0, 0), (0, 0)]); // filExtRec
        d
    }
    /// Like [`file_record`] but also gives the file a resource fork (filRLgLen
    /// @ +36, filRExtRec @ +86).
    fn file_record_with_rsrc(
        cnid: u32,
        size: u32,
        start_block: u16,
        rsrc_size: u32,
        rsrc_block: u16,
    ) -> Vec<u8> {
        let mut d = file_record(cnid, size, start_block);
        d[36..40].copy_from_slice(&rsrc_size.to_be_bytes()); // filRLgLen
        d[40..44].copy_from_slice(&512u32.to_be_bytes()); // filRPyLen (1 block)
        put_ext(&mut d, 86, &[(rsrc_block, 1), (0, 0), (0, 0)]); // filRExtRec
        d
    }
    fn dir_record(cnid: u32) -> Vec<u8> {
        let mut d = vec![0u8; 70];
        d[0] = 1; // cdrType = directory
        d[6..10].copy_from_slice(&cnid.to_be_bytes()); // dirDirID
        d
    }
    fn leaf_record(parent: u32, name: &[u8], data: &[u8]) -> Vec<u8> {
        let key_len = 6 + name.len();
        let mut r = vec![0u8; 1 + key_len];
        r[0] = key_len as u8;
        r[2..6].copy_from_slice(&parent.to_be_bytes());
        r[6] = name.len() as u8;
        r[7..7 + name.len()].copy_from_slice(name);
        r.resize(round_up_even(1 + key_len), 0); // pad key to even
        r.extend_from_slice(data);
        r
    }

    /// Build a minimal but genuine classic HFS volume: a 2-node catalog B-tree
    /// (header + one leaf) over `/hello.txt`, `/sub/`, `/sub/deep.txt`, with
    /// 512-byte allocation blocks. Layout (512-byte sectors): boot(0,1),
    /// MDB(2), bitmap(3), then alloc blocks from sector 4 — catalog(0,1),
    /// extents(2), hello data(3), deep data(4), hello resource fork(5).
    fn build_volume() -> Vec<u8> {
        let block = 512usize;
        let al_bl_st = 4u16;
        let num_alloc_blocks = 6usize;
        let mut v = vec![0u8; (al_bl_st as usize + num_alloc_blocks + 1) * block];

        // MDB at 1024.
        let mdb = 1024;
        v[mdb..mdb + 2].copy_from_slice(b"BD");
        put_u32(&mut v, mdb + 20, block as u32); // drAlBlkSiz
        put_u16(&mut v, mdb + 28, al_bl_st); // drAlBlSt
        v[mdb + 36] = 7;
        v[mdb + 37..mdb + 44].copy_from_slice(b"TestVol"); // drVN
        put_u32(&mut v, mdb + 130, block as u32); // drXTFlSize
        put_ext(&mut v, mdb + 134, &[(2, 1), (0, 0), (0, 0)]); // drXTExtRec
        put_u32(&mut v, mdb + 146, (2 * block) as u32); // drCTFlSize
        put_ext(&mut v, mdb + 150, &[(0, 2), (0, 0), (0, 0)]); // drCTExtRec

        // Extents-overflow file (alloc block 2): a header node, no leaves.
        let xt = (al_bl_st as usize + 2) * block;
        v[xt + 8] = 1; // ndType = header
        put_u16(&mut v, xt + 32, 512); // bthNodeSize
        put_u32(&mut v, xt + 36, 1); // bthNNodes

        // Catalog file (alloc block 0): header node + one leaf node.
        let cat = al_bl_st as usize * block;
        v[cat + 8] = 1; // header node
        put_u32(&mut v, cat + 24, 1); // bthFNode = node 1
        put_u16(&mut v, cat + 32, 512); // bthNodeSize
        put_u32(&mut v, cat + 36, 2); // bthNNodes
        let leaf = cat + 512;
        v[leaf + 8] = 0xFF; // leaf node
        v[leaf + 9] = 1; // height
        let recs = [
            // hello.txt carries a resource fork (data @ block 3, rsrc @ block 5).
            leaf_record(
                2,
                b"hello.txt",
                &file_record_with_rsrc(17, HELLO.len() as u32, 3, RSRC.len() as u32, 5),
            ),
            leaf_record(2, b"sub", &dir_record(16)),
            leaf_record(16, b"deep.txt", &file_record(18, DEEP.len() as u32, 4)),
            // A classic-Mac name with a `/` in it (path separator is `:` on
            // HFS). Reuses hello.txt's data block. Must surface as `A:B`.
            leaf_record(2, b"A/B", &file_record(19, HELLO.len() as u32, 3)),
        ];
        let mut pos = 14usize;
        let mut offs = vec![14u16];
        for r in &recs {
            v[leaf + pos..leaf + pos + r.len()].copy_from_slice(r);
            pos += r.len();
            offs.push(pos as u16);
        }
        put_u16(&mut v, leaf + 10, recs.len() as u16); // ndNRecs
        for (i, &o) in offs.iter().enumerate() {
            put_u16(&mut v, leaf + 512 - 2 * (i + 1), o);
        }

        // File data forks.
        let hd = (al_bl_st as usize + 3) * block;
        v[hd..hd + HELLO.len()].copy_from_slice(HELLO);
        let dd = (al_bl_st as usize + 4) * block;
        v[dd..dd + DEEP.len()].copy_from_slice(DEEP);
        // hello.txt's resource fork (alloc block 5).
        let rd = (al_bl_st as usize + 5) * block;
        v[rd..rd + RSRC.len()].copy_from_slice(RSRC);

        v
    }

    fn dev_from(bytes: &[u8]) -> MemoryBackend {
        let mut dev = MemoryBackend::new(bytes.len() as u64);
        dev.write_at(0, bytes).unwrap();
        dev
    }

    fn read_all(fs: &mut Hfs, dev: &mut dyn BlockDevice, path: &str) -> Vec<u8> {
        let mut r = fs.read_file(dev, Path::new(path)).unwrap();
        let mut out = Vec::new();
        std::io::Read::read_to_end(&mut r, &mut out).unwrap();
        out
    }

    /// Format a fresh HFS volume with the writer, add a dir + two files, flush,
    /// then read it all back through the reader.
    #[test]
    fn writer_round_trip() {
        let mut dev = MemoryBackend::new(4 * 1024 * 1024);
        let opts = super::writer::HfsFormatOpts {
            volume_name: "WriteTest".into(),
            block_size: None,
        };
        let mut w = super::writer::HfsWriter::format(&mut dev, &opts).unwrap();
        w.insert_dir("/sub", 0).unwrap();
        let hello = b"hello from the HFS writer\n";
        w.insert_file(
            &mut dev,
            "/hello.txt",
            &mut &hello[..],
            hello.len() as u64,
            0,
        )
        .unwrap();
        w.insert_file(&mut dev, "/sub/deep.txt", &mut &b"deep\n"[..], 5, 0)
            .unwrap();
        w.flush(&mut dev).unwrap();

        let mut fs = Hfs::open(&mut dev).unwrap();
        assert_eq!(fs.volume_name, "WriteTest");
        let root: Vec<_> = fs
            .list(&mut dev, Path::new("/"))
            .unwrap()
            .into_iter()
            .map(|e| (e.name, e.kind))
            .collect();
        assert!(
            root.contains(&("hello.txt".into(), EntryKind::Regular)),
            "root = {root:?}"
        );
        assert!(
            root.contains(&("sub".into(), EntryKind::Dir)),
            "root = {root:?}"
        );

        let sub: Vec<_> = fs
            .list(&mut dev, Path::new("/sub"))
            .unwrap()
            .into_iter()
            .map(|e| e.name)
            .collect();
        assert_eq!(sub, vec!["deep.txt"]);

        assert_eq!(read_all(&mut fs, &mut dev, "/hello.txt"), hello);
        assert_eq!(read_all(&mut fs, &mut dev, "/sub/deep.txt"), b"deep\n");
    }

    /// In-place mutation: build a volume, reopen it writable, add a file +
    /// directory and remove another, flush, then reopen read-only and confirm
    /// the changes persisted and unrelated files are intact.
    #[test]
    fn in_place_mutation_round_trip() {
        use crate::fs::{FileMeta, FileSource, Filesystem};

        let mut dev = MemoryBackend::new(4 * 1024 * 1024);
        let opts = super::writer::HfsFormatOpts {
            volume_name: "InPlace".into(),
            block_size: None,
        };
        {
            let mut w = super::writer::HfsWriter::format(&mut dev, &opts).unwrap();
            w.insert_dir("/keep", 0).unwrap();
            w.insert_file(&mut dev, "/old.txt", &mut &b"old\n"[..], 4, 0)
                .unwrap();
            w.insert_file(&mut dev, "/keep/inner.txt", &mut &b"inner\n"[..], 6, 0)
                .unwrap();
            w.flush(&mut dev).unwrap();
        }

        let meta = FileMeta {
            mode: 0o644,
            uid: 0,
            gid: 0,
            mtime: 0,
            atime: 0,
            ctime: 0,
        };
        let mut fs = Hfs::open_writable(&mut dev).unwrap();
        let data = b"brand new content\n".to_vec();
        fs.create_file(
            &mut dev,
            Path::new("/new.txt"),
            FileSource::Reader {
                reader: Box::new(std::io::Cursor::new(data.clone())),
                len: data.len() as u64,
            },
            meta,
        )
        .unwrap();
        fs.create_dir(&mut dev, Path::new("/newdir"), meta).unwrap();
        fs.remove(&mut dev, Path::new("/old.txt")).unwrap();
        fs.flush(&mut dev).unwrap();

        let mut ro = Hfs::open(&mut dev).unwrap();
        let root: Vec<String> = ro
            .list(&mut dev, Path::new("/"))
            .unwrap()
            .into_iter()
            .map(|e| e.name)
            .collect();
        assert!(root.contains(&"new.txt".to_string()), "{root:?}");
        assert!(root.contains(&"newdir".to_string()), "{root:?}");
        assert!(root.contains(&"keep".to_string()), "{root:?}");
        assert!(
            !root.contains(&"old.txt".to_string()),
            "old.txt should be gone: {root:?}"
        );
        assert_eq!(read_all(&mut ro, &mut dev, "/new.txt"), data);
        assert_eq!(read_all(&mut ro, &mut dev, "/keep/inner.txt"), b"inner\n");
    }

    /// The resource fork is read from its own extents (`filRLgLen` @ +36,
    /// `filRExtRec` @ +86, fork-type 0xFF) — independent of the data fork — and
    /// surfaced via the `com.apple.ResourceFork` xattr. Files without one yield
    /// no xattrs and an error from the reader.
    #[test]
    fn resource_fork_round_trip() {
        let vol = build_volume();
        let mut dev = dev_from(&vol);
        let mut fs = Hfs::open(&mut dev).unwrap();

        // hello.txt has a resource fork distinct from its data fork.
        let mut r = fs
            .open_resource_fork_reader(&mut dev, "/hello.txt")
            .unwrap();
        let mut got = Vec::new();
        std::io::Read::read_to_end(&mut r, &mut got).unwrap();
        assert_eq!(got, RSRC);
        // Data fork is unchanged.
        assert_eq!(read_all(&mut fs, &mut dev, "/hello.txt"), HELLO);

        // Surfaced as the macOS-standard xattr.
        let xattrs = fs.list_xattrs(&mut dev, Path::new("/hello.txt")).unwrap();
        assert_eq!(xattrs.len(), 1);
        assert_eq!(xattrs[0].name, "com.apple.ResourceFork");
        assert_eq!(xattrs[0].value, RSRC);

        // deep.txt has no resource fork: reader errors, no xattrs.
        assert!(
            fs.open_resource_fork_reader(&mut dev, "/sub/deep.txt")
                .is_err()
        );
        assert!(
            fs.list_xattrs(&mut dev, Path::new("/sub/deep.txt"))
                .unwrap()
                .is_empty()
        );
    }

    /// Parse the synthetic volume directly: tree + nested dir + file extraction.
    #[test]
    fn synthetic_volume_round_trip() {
        let vol = build_volume();
        let mut dev = dev_from(&vol);
        let mut fs = Hfs::open(&mut dev).unwrap();
        assert_eq!(fs.volume_name, "TestVol");

        let root: Vec<_> = fs
            .list(&mut dev, Path::new("/"))
            .unwrap()
            .into_iter()
            .map(|e| (e.name, e.kind))
            .collect();
        assert!(root.contains(&("hello.txt".into(), EntryKind::Regular)));
        assert!(root.contains(&("sub".into(), EntryKind::Dir)));
        // A classic-Mac name with a literal `/` ("A/B") surfaces canonically as
        // "A:B" — the `/` (legal on HFS, whose separator is `:`) is swapped so
        // it can't be mistaken for a path separator.
        assert!(
            root.contains(&("A:B".into(), EntryKind::Regular)),
            "expected canonical 'A:B' in root: {root:?}"
        );

        let sub: Vec<_> = fs
            .list(&mut dev, Path::new("/sub"))
            .unwrap()
            .into_iter()
            .map(|e| e.name)
            .collect();
        assert_eq!(sub, vec!["deep.txt"]);

        assert_eq!(read_all(&mut fs, &mut dev, "/hello.txt"), HELLO);
        assert_eq!(read_all(&mut fs, &mut dev, "/sub/deep.txt"), DEEP);
        // Resolving the canonical "A:B" reaches the entry (its data fork
        // aliases hello.txt's block, so the bytes match HELLO).
        assert_eq!(read_all(&mut fs, &mut dev, "/A:B"), HELLO);
    }

    /// The same volume wrapped in a DiskCopy 4.2 header is detected + read
    /// transparently through the full `AnyFs` pipeline (Part A + Part B).
    #[test]
    fn diskcopy_wrapped_hfs_via_anyfs() {
        let vol = build_volume();
        let mut img = vec![0u8; 0x54];
        img[0x40..0x44].copy_from_slice(&(vol.len() as u32).to_be_bytes()); // data size
        img[0x50] = 3; // 1440k encoding
        img[0x52] = 0x01; // magic 0x0100
        img.extend_from_slice(&vol);

        let mem = dev_from(&img);
        let mut dc = crate::block::DiskCopy42Backend::new(Box::new(mem)).unwrap();
        let mut fs = crate::inspect::AnyFs::open(&mut dc).unwrap();
        assert_eq!(fs.kind_string(), "hfs");
        let names: Vec<_> = fs
            .list(&mut dc, "/")
            .unwrap()
            .into_iter()
            .map(|e| e.name)
            .collect();
        assert!(names.iter().any(|n| n == "hello.txt"));

        let mut out = Vec::new();
        fs.copy_file_to(&mut dc, "/sub/deep.txt", &mut out).unwrap();
        assert_eq!(out, DEEP);
    }
}