fs-mac 0.1.0

Read, edit, create, check and clone classic Mac filesystems: MFS, HFS (incl. HFV images), HFS+/HFSX and Lisa, plus resource forks and BinHex
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
1298
1299
1300
1301
1302
1303
1304
1305
1306
1307
1308
1309
1310
1311
1312
1313
1314
1315
1316
1317
1318
1319
1320
1321
1322
1323
1324
1325
1326
1327
1328
1329
1330
1331
1332
1333
1334
1335
1336
1337
1338
1339
1340
1341
1342
1343
1344
1345
1346
1347
1348
1349
1350
1351
1352
1353
1354
1355
1356
1357
1358
1359
1360
1361
1362
1363
1364
1365
1366
1367
1368
1369
1370
1371
1372
1373
1374
1375
1376
1377
1378
1379
1380
1381
1382
1383
1384
1385
1386
1387
1388
1389
1390
1391
1392
1393
1394
1395
1396
1397
1398
1399
1400
1401
1402
1403
1404
1405
1406
1407
1408
1409
1410
1411
1412
1413
1414
1415
1416
1417
1418
1419
1420
1421
1422
1423
1424
1425
1426
1427
1428
1429
1430
1431
1432
1433
1434
1435
1436
1437
1438
1439
1440
1441
1442
1443
1444
1445
1446
1447
1448
1449
1450
1451
1452
1453
1454
1455
1456
1457
1458
1459
1460
1461
1462
1463
1464
1465
1466
1467
1468
1469
1470
1471
1472
1473
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485
1486
1487
1488
1489
1490
1491
1492
1493
1494
1495
1496
1497
1498
1499
1500
1501
1502
1503
1504
1505
1506
1507
1508
1509
1510
1511
1512
1513
1514
1515
1516
1517
1518
1519
1520
1521
1522
1523
1524
1525
1526
1527
1528
1529
1530
1531
1532
1533
1534
1535
1536
1537
1538
1539
1540
1541
1542
1543
1544
1545
1546
1547
1548
1549
1550
1551
1552
1553
1554
1555
1556
1557
1558
1559
1560
1561
1562
1563
1564
1565
1566
1567
1568
1569
1570
1571
1572
1573
1574
1575
1576
1577
1578
1579
1580
1581
1582
1583
1584
1585
1586
1587
1588
1589
1590
1591
1592
1593
1594
1595
1596
1597
1598
1599
1600
1601
1602
1603
1604
1605
1606
1607
1608
1609
1610
1611
1612
1613
1614
1615
1616
1617
1618
1619
1620
1621
1622
1623
1624
1625
1626
1627
1628
1629
1630
1631
1632
1633
1634
1635
1636
1637
1638
1639
1640
1641
1642
1643
1644
1645
1646
1647
1648
1649
1650
1651
1652
1653
1654
1655
1656
1657
1658
1659
1660
1661
1662
1663
1664
1665
1666
1667
1668
1669
1670
1671
1672
1673
1674
1675
1676
1677
1678
1679
1680
1681
1682
1683
1684
1685
1686
1687
1688
1689
1690
1691
1692
1693
1694
1695
1696
1697
1698
1699
1700
1701
1702
1703
1704
1705
1706
1707
1708
1709
1710
1711
1712
1713
1714
1715
1716
1717
1718
1719
1720
1721
1722
1723
1724
1725
1726
1727
1728
1729
1730
1731
1732
1733
1734
1735
1736
1737
1738
1739
1740
1741
1742
1743
1744
1745
1746
1747
1748
1749
1750
1751
1752
1753
1754
1755
1756
1757
1758
1759
1760
1761
1762
1763
1764
1765
1766
1767
1768
1769
1770
1771
1772
1773
1774
1775
1776
1777
1778
1779
1780
1781
1782
1783
1784
1785
1786
1787
1788
1789
1790
1791
1792
1793
1794
1795
1796
1797
1798
1799
1800
1801
1802
1803
1804
1805
1806
1807
1808
1809
1810
1811
1812
1813
1814
1815
1816
1817
1818
1819
1820
1821
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
1845
1846
1847
1848
1849
1850
1851
1852
1853
1854
1855
1856
1857
1858
1859
1860
1861
1862
1863
1864
1865
1866
1867
1868
1869
1870
1871
1872
1873
1874
1875
1876
1877
1878
1879
1880
1881
1882
1883
1884
1885
1886
1887
1888
1889
1890
1891
1892
1893
1894
1895
1896
1897
1898
1899
1900
1901
1902
1903
1904
1905
1906
1907
1908
1909
1910
1911
1912
1913
1914
1915
1916
1917
1918
1919
1920
1921
1922
1923
1924
1925
1926
1927
1928
1929
1930
1931
1932
1933
1934
1935
1936
1937
1938
1939
1940
1941
1942
1943
1944
1945
1946
1947
1948
1949
1950
1951
1952
1953
1954
1955
1956
1957
1958
1959
1960
1961
1962
1963
1964
1965
1966
1967
1968
1969
1970
1971
1972
1973
1974
1975
1976
1977
1978
1979
1980
1981
1982
1983
1984
1985
1986
1987
1988
1989
1990
1991
1992
1993
1994
1995
1996
1997
1998
1999
2000
2001
2002
2003
2004
2005
2006
2007
2008
2009
2010
2011
2012
2013
2014
2015
2016
2017
2018
2019
2020
2021
2022
2023
2024
2025
2026
2027
2028
2029
2030
2031
2032
2033
2034
2035
2036
2037
2038
2039
2040
2041
2042
2043
2044
2045
2046
2047
2048
2049
2050
2051
2052
2053
2054
2055
//! HFS filesystem checker (fsck) — read-only integrity verification.
//!
//! Validates the HFS volume in four phases:
//! 1. MDB sanity checks
//! 2. B-tree structure verification
//! 3. Catalog consistency (threads ↔ records, counts)
//! 4. Extent/allocation bitmap cross-check (including extents overflow)
//!
//! # Unused B-tree nodes
//!
//! Apple's modern `fsck_hfs` (`BTCheckUnusedNodes`, called from `CheckCatalogBTree`
//! for HFS and HFS+ alike) reports "Unused node is not erased" as a level-1, minor
//! repair: it stops at the first one and its repair zeroes them all. System 6-8 and
//! Disk First Aid never erased freed nodes or checked for it, so nearly every
//! classic volume a real Mac wrote has hundreds of them. Here that is one warning
//! per tree (catalog, extents) giving the count, not an error per node, and
//! `repair_hfs` zeroes them the way `fsck_hfs` does. Our own writer erases what it
//! frees (`btree_free_node`), so a fresh rb-cli edit never adds to the count.

use byteorder::{BigEndian, ByteOrder};
#[cfg(feature = "rust173-polyfill")]
use disk_core::rust173::IntIsMultipleOf as _;

use crate::hfs::HfsMasterDirectoryBlock;
use crate::hfs_common::{btree_erase_free_nodes, btree_unerased_free_nodes, BTreeHeader};
use disk_core::fsck::{FsckIssue, FsckResult, FsckStats, RepairReport};

pub(super) const CATALOG_DIR_THREAD: i8 = 3;
pub(super) const CATALOG_FILE_THREAD: i8 = 4;

mod bitmap;
mod btree;
mod catalog;
mod extents;
mod mdb;

use bitmap::{check_extents_and_bitmap, repair_extents, repair_mdb_counts_and_bitmap};
use btree::{
    check_btree_structure, fix_leaf_record_count, repair_btree_structure_leaves_only,
    repair_node_bitmap,
};
use catalog::{check_catalog_consistency, repair_catalog_consistency};
use mdb::{check_allocation_area_end, check_alternate_mdb, check_embedded_hfs_plus, check_mdb};

// Re-export for external callers (hfs.rs uses `super::hfs_fsck::rebuild_index_nodes`).
pub(crate) use btree::rebuild_index_nodes;

// ---------------------------------------------------------------------------
// HFS-specific issue codes and repair classification
// ---------------------------------------------------------------------------

/// HFS-specific issue codes used internally for repair classification.
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub(super) enum HfsFsckCode {
    // MDB issues
    BadSignature,
    AlternateMdbMismatch,
    /// The allocation area does not end at the partition's next-to-last
    /// sector, where Mac OS keeps the alternate MDB (fsck_hfs E_ABlkSt, R-058).
    AllocationAreaEnd,
    EmbeddedHfsPlusInvalid,
    BadBlockSize,
    BlockSizeUpperBound,
    VbmDataAreaCollision,
    MdbVBMStTooLow,
    MdbAlBlStTooLow,
    MdbTotalBlocksInvalid,
    InvalidClumpSize,
    NextCatalogIdTooLow,
    // B-tree structure
    HeaderNodeBadKind,
    RootNodeBadKind,
    MapNodeBadStructure,
    NodeBitmapMissing,
    KeysOutOfOrder,
    /// An index separator that is not its child's first key (fsck_hfs E_IKey).
    IndexKeyMismatch,
    /// A leaf with no records and no siblings (fsck_hfs E_BadNode).
    EmptyLeafWithoutSiblings,
    /// A free node still holding data (fsck_hfs "Unused node is not erased").
    FreeNodeNotErased,
    OffsetTableNotMonotonic,
    OffsetTableOutOfBounds,
    LeafChainBroken,
    LeafBacklinkMismatch,
    LeafRecordCountMismatch,
    IndexSiblingLinkBroken,
    InvalidRecordLength,
    // Catalog consistency
    MissingDirThread,
    ThreadParentNameMismatch,
    FileCountMismatch,
    FolderCountMismatch,
    OrphanedThread,
    MissingParent,
    ValenceMismatch,
    // Directory structure
    DirectoryLoop,
    NestingDepthWarning,
    // Catalog record field validation
    LeoFExceedsPeoF,
    InvalidCnidRange,
    ReservedFieldNonZero,
    InvalidCatalogName,
    /// Warning: a structurally valid name that is nonetheless unusual (e.g.
    /// embeds null/control bytes). Classic Mac OS permits any byte except the
    /// colon, and real disks carry such names (leading nulls to force sort
    /// order), so this is informational, not an error.
    UnusualCatalogName,
    ThreadNameNotEmpty,
    // Extents overflow B-tree structure
    ExtentsBtreeStructure,
    // Extent/allocation
    BadBlockExtentNotInBitmap,
    ExtentOutOfRange,
    OverlappingExtents,
    BitmapMismatch,
    FreeBlockCountMismatch,
}

/// Whether an HFS issue code is automatically repairable.
fn is_repairable(code: HfsFsckCode) -> bool {
    !matches!(
        code,
        HfsFsckCode::BadBlockSize
            | HfsFsckCode::AllocationAreaEnd
            | HfsFsckCode::BlockSizeUpperBound
            | HfsFsckCode::VbmDataAreaCollision
            | HfsFsckCode::MdbVBMStTooLow
            | HfsFsckCode::MdbAlBlStTooLow
            | HfsFsckCode::MdbTotalBlocksInvalid
            | HfsFsckCode::InvalidClumpSize
            | HfsFsckCode::EmbeddedHfsPlusInvalid
            | HfsFsckCode::DirectoryLoop
            | HfsFsckCode::NestingDepthWarning
            | HfsFsckCode::LeoFExceedsPeoF
            | HfsFsckCode::InvalidCnidRange
            | HfsFsckCode::InvalidCatalogName
            | HfsFsckCode::UnusualCatalogName
            | HfsFsckCode::OffsetTableNotMonotonic
            | HfsFsckCode::OffsetTableOutOfBounds
            | HfsFsckCode::MissingParent
    )
}

/// Build a shared `FsckIssue` from an HFS-specific code and message.
pub(super) fn hfs_issue(code: HfsFsckCode, message: impl Into<String>) -> FsckIssue {
    FsckIssue {
        code: format!("{:?}", code),
        message: message.into(),
        repairable: is_repairable(code),
        debug: false,
    }
}

/// Run a full integrity check on a classic HFS volume.
///
/// `mdb` — parsed Master Directory Block.
/// `catalog_data` — full catalog B-tree file content.
/// `bitmap` — volume allocation bitmap bytes.
/// `extents_data` — optional extents overflow B-tree file content (for files with >3 extents).
/// `alt_mdb_sector` — optional raw 512-byte alternate MDB sector (last sector of volume).
/// `partition_len` — the partition's length when known; the allocation area must end at its next-to-last sector.
pub(crate) fn check_hfs_integrity(
    mdb: &HfsMasterDirectoryBlock,
    catalog_data: &[u8],
    bitmap: &[u8],
    extents_data: Option<&[u8]>,
    alt_mdb_sector: Option<&[u8; 512]>,
    partition_len: Option<u64>,
) -> FsckResult {
    let mut errors = Vec::new();
    let mut warnings = Vec::new();
    let mut leaf_nodes_visited = 0u32;
    let mut orphaned_threads = 0u32;
    let mut files_checked = 0u32;
    let mut directories_checked = 0u32;

    // Phase 1: MDB sanity
    check_mdb(mdb, &mut errors);
    check_allocation_area_end(mdb, partition_len, &mut errors);

    // If signature is bad, the rest of the check is meaningless
    if errors.iter().any(|e| e.code == "BadSignature") {
        let repairable = errors.iter().any(|e| e.repairable);
        return FsckResult {
            errors,
            warnings,
            stats: build_stats(
                files_checked,
                directories_checked,
                leaf_nodes_visited,
                orphaned_threads,
            ),
            repairable,
            orphaned_entries: Vec::new(),
        };
    }

    // Phase 1b: Alternate MDB cross-check
    if let Some(alt_sector) = alt_mdb_sector {
        check_alternate_mdb(mdb, alt_sector, &mut errors);
    }

    // Phase 1c: Embedded HFS+ wrapper check
    check_embedded_hfs_plus(mdb, &mut errors, &mut warnings);

    // Phase 2: B-tree structure
    //
    // A blank HFS volume (no files) may have an empty or minimal catalog B-tree.
    // If the volume reports zero files and zero folders and the catalog data is
    // too small to contain a valid B-tree header, treat this as a valid empty
    // volume rather than an error.
    let is_empty_volume = mdb.file_count == 0 && mdb.folder_count == 0;

    if catalog_data.len() < 44 {
        // Need at least 44 bytes to read the B-tree header (14-byte node descriptor
        // + 30 bytes of header record fields).
        if !is_empty_volume {
            errors.push(hfs_issue(
                HfsFsckCode::HeaderNodeBadKind,
                "catalog B-tree data too small to contain a header",
            ));
        }
        let repairable = errors.iter().any(|e| e.repairable);
        return FsckResult {
            errors,
            warnings,
            stats: build_stats(
                files_checked,
                directories_checked,
                leaf_nodes_visited,
                orphaned_threads,
            ),
            repairable,
            orphaned_entries: Vec::new(),
        };
    }

    let header = BTreeHeader::read(catalog_data);
    let node_size = header.node_size as usize;
    if node_size == 0 || catalog_data.len() < node_size {
        if !is_empty_volume {
            errors.push(hfs_issue(
                HfsFsckCode::HeaderNodeBadKind,
                "catalog B-tree node size is zero or catalog data too small",
            ));
        }
        let repairable = errors.iter().any(|e| e.repairable);
        return FsckResult {
            errors,
            warnings,
            stats: build_stats(
                files_checked,
                directories_checked,
                leaf_nodes_visited,
                orphaned_threads,
            ),
            repairable,
            orphaned_entries: Vec::new(),
        };
    }
    check_btree_structure(catalog_data, &header, &mut errors, &mut leaf_nodes_visited);

    // Phase 3: Catalog consistency
    let mut orphaned_entries = Vec::new();
    check_catalog_consistency(
        mdb,
        catalog_data,
        &header,
        &mut errors,
        &mut warnings,
        &mut files_checked,
        &mut directories_checked,
        &mut orphaned_threads,
        &mut orphaned_entries,
    );

    // Phase 3.5: Extents overflow B-tree structure
    if let Some(ext_data) = extents_data {
        extents::check_extents_btree_structure(ext_data, &mut errors);
    }
    check_unerased_free_nodes(catalog_data, extents_data, &mut warnings);

    // Phase 4: Extent/allocation bitmap
    check_extents_and_bitmap(
        mdb,
        catalog_data,
        &header,
        bitmap,
        extents_data,
        &mut errors,
        &mut warnings,
    );

    let repairable = errors.iter().any(|e| e.repairable)
        || warnings.iter().any(|w| w.code == "FreeNodeNotErased");
    FsckResult {
        errors,
        warnings,
        stats: build_stats(
            files_checked,
            directories_checked,
            leaf_nodes_visited,
            orphaned_threads,
        ),
        repairable,
        orphaned_entries,
    }
}

/// Zero the free nodes of the catalog and extents B-trees, noting each tree touched.
fn erase_unused_nodes(
    catalog_data: &mut [u8],
    extents_data: Option<&mut Vec<u8>>,
    report: &mut RepairReport,
) {
    let ext = extents_data.map(|v| v.as_mut_slice());
    for (tree, data) in [("catalog", Some(catalog_data)), ("extents", ext)] {
        let Some(data) = data.filter(|d| d.len() >= 512) else {
            continue;
        };
        let node_size = BTreeHeader::read(data).node_size as usize;
        let erased = btree_erase_free_nodes(data, node_size);
        if erased > 0 {
            report
                .fixes_applied
                .push(format!("Erased {erased} unused {tree} B-tree node(s)"));
        }
    }
}

/// One warning per tree with leftover data in free nodes; normal on classic volumes (module docs).
fn check_unerased_free_nodes(
    catalog_data: &[u8],
    extents_data: Option<&[u8]>,
    warnings: &mut Vec<FsckIssue>,
) {
    for (tree, data) in [("catalog", Some(catalog_data)), ("extents", extents_data)] {
        let Some(data) = data.filter(|d| d.len() >= 512) else {
            continue;
        };
        let dirty = btree_unerased_free_nodes(data, BTreeHeader::read(data).node_size as usize);
        if let Some(first) = dirty.first() {
            warnings.push(hfs_issue(
                HfsFsckCode::FreeNodeNotErased,
                format!(
                    "{tree} B-tree: {} unused node(s) not erased (first: node {first}); \
                     classic Mac OS leaves freed nodes as-is, repair zeroes them",
                    dirty.len()
                ),
            ));
        }
    }
}

fn build_stats(files: u32, dirs: u32, leaf_nodes: u32, orphaned_threads: u32) -> FsckStats {
    let mut extra = vec![("Leaf nodes visited".into(), leaf_nodes.to_string())];
    if orphaned_threads > 0 {
        extra.push(("Orphaned threads".into(), orphaned_threads.to_string()));
    }
    FsckStats {
        files_checked: files,
        directories_checked: dirs,
        extra,
    }
}

// ---------------------------------------------------------------------------
// Repair
// ---------------------------------------------------------------------------

/// Repair repairable HFS volume issues in-place on the in-memory structures.
///
/// After this returns, the caller must write the modified `mdb`, `catalog_data`,
/// and `bitmap` back to disk.
pub(crate) fn repair_hfs(
    mdb: &mut HfsMasterDirectoryBlock,
    catalog_data: &mut [u8],
    bitmap: &mut Vec<u8>,
    mut extents_data: Option<&mut Vec<u8>>,
) -> RepairReport {
    // Count unrepairable issues by running a quick check first
    let check_result = check_hfs_integrity(
        mdb,
        catalog_data,
        bitmap,
        extents_data.as_deref().map(|v| v.as_slice()),
        None, // alt MDB not available during repair
        None, // the partition length is not either; the fit is not repairable anyway
    );
    let unrepairable_count = check_result.errors.iter().filter(|e| !e.repairable).count();

    let mut report = RepairReport {
        fixes_applied: Vec::new(),
        fixes_failed: Vec::new(),
        unrepairable_count,
    };

    // No errors, only unused nodes to zero: don't rebuild a healthy catalog for that.
    if check_result.errors.is_empty() {
        erase_unused_nodes(catalog_data, extents_data.as_deref_mut(), &mut report);
        return report;
    }

    // --- Phase 0: MDB signature ---
    if mdb.signature != 0x4244 {
        mdb.signature = 0x4244;
        // Also patch raw_sector so serialize_to_sector is correct
        BigEndian::write_u16(&mut mdb.raw_sector[0..2], 0x4244);
        report
            .fixes_applied
            .push("Fixed MDB signature to 0x4244".into());
    }

    // Need a valid node_size to proceed.  On a blank volume (no files, no
    // folders) the catalog may be empty/zeroed — nothing to repair.
    let is_empty_volume = mdb.file_count == 0 && mdb.folder_count == 0;
    if catalog_data.len() < 44 {
        if !is_empty_volume {
            report
                .fixes_failed
                .push("Cannot repair: catalog B-tree data too small to contain a header".into());
        }
        return report;
    }
    let header = BTreeHeader::read(catalog_data);
    let node_size = header.node_size as usize;
    if node_size == 0 || catalog_data.len() < node_size {
        if !is_empty_volume {
            report
                .fixes_failed
                .push("Cannot repair: B-tree node size is zero or catalog data too small".into());
        }
        return report;
    }

    // --- Phase 1: Initial B-tree structure fixes (leaf chain only) ---
    // Fix header/root node kinds and rebuild the leaf chain so catalog
    // consistency repairs can find all records. Index nodes are NOT rebuilt
    // yet — that must happen AFTER catalog modifications.
    repair_btree_structure_leaves_only(catalog_data, node_size, &mut report);

    // --- Phase 2: Catalog consistency fixes ---
    // This may insert/remove leaf records (threads, orphans, valence).
    repair_catalog_consistency(mdb, catalog_data, node_size, &mut report);

    // --- Phase 3: Rebuild B-tree index nodes and fix header counts ---
    // Now that all catalog modifications are done, rebuild the full B-tree
    // structure: index nodes, sibling links, and header record counts.
    rebuild_index_nodes(catalog_data, node_size, &mut report);
    fix_leaf_record_count(catalog_data, &mut report);

    // Fix node bitmap after all structural changes are finalized
    repair_node_bitmap(catalog_data, node_size, &mut report);

    // --- Phase 3.5: Extents overflow B-tree structure repair ---
    if let Some(ext) = extents_data.as_mut() {
        extents::repair_extents_btree_structure(ext, &mut report);
    }

    // --- Phase 3.6: Zero unused B-tree nodes, as fsck_hfs's repair does ---
    erase_unused_nodes(catalog_data, extents_data.as_deref_mut(), &mut report);

    // --- Phase 4: Extent fixes ---
    repair_extents(
        mdb,
        catalog_data,
        node_size,
        extents_data.as_deref().map(|v| v.as_slice()),
        &mut report,
    );

    // --- Phase 5: MDB counts + bitmap rebuild ---
    repair_mdb_counts_and_bitmap(
        mdb,
        catalog_data,
        bitmap,
        extents_data.as_deref().map(|v| v.as_slice()),
        &mut report,
    );

    report
}

#[cfg(test)]
mod tests {
    use super::btree::{
        check_key_ordering, check_map_nodes, check_node_bitmap_consistency, repair_key_ordering,
        repair_map_nodes, repair_node_bitmap,
    };
    use crate::hfs_common::{
        bitmap_set_bit_be, BTREE_HEADER_NODE, BTREE_INDEX_NODE, BTREE_LEAF_NODE, BTREE_MAP_NODE,
    };
    use std::collections::HashMap;

    use super::catalog::check_directory_structure;
    use super::mdb::validate_hfs_name;
    use super::*;
    use crate::hfs::{HfsExtDescriptor, CATALOG_DIR, CATALOG_FILE};
    use crate::hfs_common::btree_record_range;

    #[test]
    fn test_fsck_code_to_string() {
        let issue = hfs_issue(HfsFsckCode::BadSignature, "test");
        assert_eq!(issue.code, "BadSignature");
        let issue = hfs_issue(HfsFsckCode::LeafChainBroken, "test");
        assert_eq!(issue.code, "LeafChainBroken");
    }

    #[test]
    fn test_fsck_result_is_clean() {
        let result = FsckResult {
            errors: vec![],
            warnings: vec![hfs_issue(HfsFsckCode::BitmapMismatch, "minor")],
            stats: build_stats(0, 0, 0, 0),
            repairable: false,
            orphaned_entries: vec![],
        };
        assert!(result.is_clean()); // warnings don't count

        let result_err = FsckResult {
            errors: vec![hfs_issue(HfsFsckCode::BadSignature, "bad")],
            warnings: vec![],
            stats: build_stats(0, 0, 0, 0),
            repairable: true,
            orphaned_entries: vec![],
        };
        assert!(!result_err.is_clean());
    }

    #[test]
    fn test_block_size_multiple_of_512() {
        // 8704 = 17 × 512 — valid HFS block size
        let mut mdb = make_test_mdb();
        mdb.block_size = 8704;
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            errors.is_empty(),
            "8704 should be valid: {:?}",
            errors
                .iter()
                .map(|e| e.message.as_str())
                .collect::<Vec<_>>()
        );

        // Not a multiple of 512
        mdb.block_size = 1000;
        errors.clear();
        check_mdb(&mdb, &mut errors);
        assert_eq!(errors.len(), 1);
        assert_eq!(errors[0].code, "BadBlockSize");

        // Zero is invalid
        mdb.block_size = 0;
        errors.clear();
        check_mdb(&mdb, &mut errors);
        assert_eq!(errors.len(), 1);
        assert_eq!(errors[0].code, "BadBlockSize");
    }

    fn make_test_mdb() -> HfsMasterDirectoryBlock {
        HfsMasterDirectoryBlock {
            signature: 0x4244,
            create_date: 0,
            modify_date: 0,
            total_blocks: 100,
            block_size: 4096,
            free_blocks: 50,
            volume_name: "Test".into(),
            volume_name_raw: b"Test".to_vec(),
            volume_bitmap_block: 3,
            first_alloc_block: 5,
            next_catalog_id: 16,
            file_count: 0,
            folder_count: 0, // HFS drDirCnt excludes root directory
            finder_info: [0; 8],
            catalog_file_size: 0,
            catalog_file_extents: [HfsExtDescriptor {
                start_block: 0,
                block_count: 0,
            }; 3],
            extents_file_size: 0,
            extents_file_extents: [HfsExtDescriptor {
                start_block: 0,
                block_count: 0,
            }; 3],
            embedded_signature: 0,
            embedded_start_block: 0,
            embedded_block_count: 0,
            raw_sector: [0; 512],
        }
    }

    #[test]
    fn test_vbm_no_collision() {
        // Default test MDB: bitmap at sector 3, total_blocks=100.
        // VBM needs ceil(100 / 4096) = 1 sector. VBM occupies sector 3..4.
        // Data area starts at sector 5. No collision.
        let mdb = make_test_mdb();
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            errors.is_empty(),
            "no VBM collision expected: {:?}",
            errors
                .iter()
                .map(|e| e.message.as_str())
                .collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_vbm_collision_detected() {
        let mut mdb = make_test_mdb();
        // Bitmap at sector 3, total_blocks=50000 → needs ceil(50000/4096) = 13 sectors
        // VBM occupies sectors 3..16, but data area starts at sector 5 → collision
        mdb.total_blocks = 50000;
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            errors.iter().any(|e| e.code == "VbmDataAreaCollision"),
            "should detect VBM collision: {:?}",
            errors
                .iter()
                .map(|e| e.message.as_str())
                .collect::<Vec<_>>()
        );
        // VBM collision is non-repairable
        assert!(
            !errors
                .iter()
                .find(|e| e.code == "VbmDataAreaCollision")
                .unwrap()
                .repairable
        );
    }

    // -----------------------------------------------------------------------
    // Stage 1: Extended MDB Validation tests
    // -----------------------------------------------------------------------

    #[test]
    fn test_mdb_vbm_start_too_low() {
        let mut mdb = make_test_mdb();
        mdb.volume_bitmap_block = 1; // must be >= 3
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            errors.iter().any(|e| e.code == "MdbVBMStTooLow"),
            "should detect VBM start too low: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_mdb_vbm_start_at_3_ok() {
        let mdb = make_test_mdb(); // volume_bitmap_block = 3
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            !errors.iter().any(|e| e.code == "MdbVBMStTooLow"),
            "VBM start at 3 should be ok"
        );
    }

    #[test]
    fn test_mdb_alblst_too_low() {
        let mut mdb = make_test_mdb();
        mdb.first_alloc_block = 2; // must be >= 3 at minimum
        mdb.volume_bitmap_block = 3;
        mdb.total_blocks = 1; // tiny volume so VBM is 1 sector (3..4)
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        // first_alloc_block=2 < vbm_end=4, triggers VbmDataAreaCollision
        // and first_alloc_block=2 < 3 triggers MdbAlBlStTooLow
        // Due to the overlap check being reported first, AlBlSt<3 is also caught
        // in the else-if fallback when total_blocks is 0. But with total_blocks=1,
        // the VBM collision covers it. Let's test with total_blocks=0 path.
        let mut mdb2 = make_test_mdb();
        mdb2.first_alloc_block = 2;
        mdb2.total_blocks = 0;
        mdb2.block_size = 0; // skip VBM collision path
        let mut errors2 = Vec::new();
        check_mdb(&mdb2, &mut errors2);
        assert!(
            errors2.iter().any(|e| e.code == "MdbAlBlStTooLow"),
            "should detect first alloc block too low: {:?}",
            errors2.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_mdb_block_size_upper_bound() {
        let mut mdb = make_test_mdb();
        mdb.block_size = 0x8000_0000;
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            errors.iter().any(|e| e.code == "BlockSizeUpperBound"),
            "should detect block size exceeding max: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_mdb_block_size_at_max_valid() {
        let mut mdb = make_test_mdb();
        mdb.block_size = 0x7FFF_FE00;
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            !errors.iter().any(|e| e.code == "BlockSizeUpperBound"),
            "block size at max should not trigger upper bound error"
        );
    }

    #[test]
    fn test_mdb_total_blocks_zero() {
        let mut mdb = make_test_mdb();
        mdb.total_blocks = 0;
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            errors.iter().any(|e| e.code == "MdbTotalBlocksInvalid"),
            "should detect total_blocks=0: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_mdb_clump_size_not_multiple() {
        let mut mdb = make_test_mdb();
        // block_size=4096, set drClpSiz to 5000 (not a multiple of 4096)
        BigEndian::write_u32(&mut mdb.raw_sector[24..28], 5000);
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            errors.iter().any(|e| e.code == "InvalidClumpSize"),
            "should detect clump size not a multiple of block size: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_mdb_clump_size_exceeds_volume() {
        let mut mdb = make_test_mdb();
        // total_blocks=100, block_size=4096 → volume_size=409600
        // Set drXTClpSiz to something larger
        BigEndian::write_u32(&mut mdb.raw_sector[74..78], 4096 * 200);
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            errors
                .iter()
                .any(|e| e.code == "InvalidClumpSize" && e.message.contains("exceeds volume size")),
            "should detect clump size exceeding volume: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_mdb_clump_size_valid() {
        let mut mdb = make_test_mdb();
        // Set all three clump sizes to valid multiples of block_size (4096)
        BigEndian::write_u32(&mut mdb.raw_sector[24..28], 4096 * 2); // drClpSiz
        BigEndian::write_u32(&mut mdb.raw_sector[74..78], 4096); // drXTClpSiz
        BigEndian::write_u32(&mut mdb.raw_sector[78..82], 4096 * 4); // drCTClpSiz
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            !errors.iter().any(|e| e.code == "InvalidClumpSize"),
            "valid clump sizes should not trigger errors"
        );
    }

    #[test]
    fn test_mdb_clump_size_zero_ok() {
        let mdb = make_test_mdb(); // raw_sector all zeros → clump sizes are 0
        let mut errors = Vec::new();
        check_mdb(&mdb, &mut errors);
        assert!(
            !errors.iter().any(|e| e.code == "InvalidClumpSize"),
            "zero clump sizes should be accepted"
        );
    }

    // -----------------------------------------------------------------------
    // Stage 2: Catalog Record Field Validation tests
    // -----------------------------------------------------------------------

    /// Build a minimal catalog B-tree containing a root dir (CNID 2) with
    /// its thread, plus one file record with configurable fields.
    /// Returns (catalog_data, file_cnid).
    #[allow(clippy::too_many_arguments)] // test helper composes a fixture record with many tunable fields
    fn make_btree_with_file(
        file_cnid: u32,
        data_logical: u32,
        data_physical: u32,
        rsrc_logical: u32,
        rsrc_physical: u32,
        reserved_byte: u8,
        data_start_block: u16,
        rsrc_start_block: u16,
    ) -> Vec<u8> {
        let node_size = 512usize;
        let num_nodes = 4usize;
        let mut data = vec![0u8; node_size * num_nodes];

        // Node 0: Header node
        data[8] = BTREE_HEADER_NODE as u8;
        BigEndian::write_u16(&mut data[10..12], 3); // 3 records

        let hr = 14;
        BigEndian::write_u16(&mut data[hr..hr + 2], 1); // depth = 1
        BigEndian::write_u32(&mut data[hr + 2..hr + 6], 1); // root_node = 1
        BigEndian::write_u32(&mut data[hr + 6..hr + 10], 4); // leaf_records = 4
        BigEndian::write_u32(&mut data[hr + 10..hr + 14], 1); // first_leaf = 1
        BigEndian::write_u32(&mut data[hr + 14..hr + 18], 1); // last_leaf = 1
        BigEndian::write_u16(&mut data[hr + 18..hr + 20], node_size as u16);
        BigEndian::write_u16(&mut data[hr + 20..hr + 22], 37); // max_key_len
        BigEndian::write_u32(&mut data[hr + 22..hr + 26], num_nodes as u32);
        BigEndian::write_u32(&mut data[hr + 26..hr + 30], (num_nodes - 2) as u32);

        // Offset table for header node
        let ot = node_size;
        BigEndian::write_u16(&mut data[ot - 2..ot], 14);
        BigEndian::write_u16(&mut data[ot - 4..ot - 2], 0x78);
        BigEndian::write_u16(&mut data[ot - 6..ot - 4], 0xf8);
        BigEndian::write_u16(&mut data[ot - 8..ot - 6], node_size as u16 - 8);

        // Node bitmap: mark nodes 0 and 1 as allocated
        data[0xf8] = 0b11000000;

        // Node 1: Leaf node with 4 records:
        //   rec 0: root dir thread (CNID 2 → parent 1, name "Test")
        //   rec 1: root dir (parent_id=1, name="", CNID=2, valence=1)
        //   rec 2: file record (parent_id=2, name="File", CNID=file_cnid)
        //   rec 3: file thread (CNID=file_cnid → parent 2, name "File")
        // Keys must be sorted: (1,"") < (2,"") < (2,"File") < (file_cnid,"")
        let n1 = node_size;
        data[n1 + 8] = BTREE_LEAF_NODE as u8;
        data[n1 + 9] = 1; // height

        // Key order: (1,"Test") < (2,"") < (2,"File") < (file_cnid,"")
        // So: rec0=root dir, rec1=root dir thread, rec2=file, rec3=file thread
        let mut write_pos = n1 + 14;
        let mut num_recs = 0u16;

        // Record 0: Root directory — key (parent_id=1, name="Test")
        {
            let kl_off = write_pos;
            data[kl_off] = 10; // key_len = 10 (1+4+1+4)
            data[kl_off + 2..kl_off + 6].copy_from_slice(&1u32.to_be_bytes()); // parent_id=1
            data[kl_off + 6] = 4; // name_len=4
            data[kl_off + 7..kl_off + 11].copy_from_slice(b"Test");
            let rec_off = kl_off + 12; // 1+10=11 → pad to 12
            data[rec_off] = CATALOG_DIR as u8; // type = 1
            BigEndian::write_u16(&mut data[rec_off + 4..rec_off + 6], 1); // valence=1
            BigEndian::write_u32(&mut data[rec_off + 6..rec_off + 10], 2); // dirID=2
            write_pos = rec_off + 70;
            num_recs += 1;
        }

        // Record 1: Root dir thread — key (parent_id=2, name="")
        {
            let kl_off = write_pos;
            data[kl_off] = 6; // key_len=6
            data[kl_off + 2..kl_off + 6].copy_from_slice(&2u32.to_be_bytes());
            data[kl_off + 6] = 0; // name_len=0
            let rec_off = kl_off + 8; // 1+6=7 → pad to 8
            data[rec_off] = CATALOG_DIR_THREAD as u8;
            BigEndian::write_u32(&mut data[rec_off + 10..rec_off + 14], 1); // parent=1
            data[rec_off + 14] = 4;
            data[rec_off + 15..rec_off + 19].copy_from_slice(b"Test");
            write_pos = rec_off + 46;
            num_recs += 1;
        }

        // Record 2: File record — key (parent_id=2, name="File")
        {
            let kl_off = write_pos;
            data[kl_off] = 10; // key_len=10 (1+4+1+4)
            data[kl_off + 2..kl_off + 6].copy_from_slice(&2u32.to_be_bytes());
            data[kl_off + 6] = 4; // name_len=4
            data[kl_off + 7..kl_off + 11].copy_from_slice(b"File");
            let rec_off = kl_off + 12; // 1+10=11 → pad to 12
            data[rec_off] = CATALOG_FILE as u8; // type = 2
            data[rec_off + 1] = reserved_byte; // cdrResrv
            BigEndian::write_u32(&mut data[rec_off + 20..rec_off + 24], file_cnid); // filFlNum
            BigEndian::write_u16(&mut data[rec_off + 24..rec_off + 26], data_start_block);
            BigEndian::write_u32(&mut data[rec_off + 26..rec_off + 30], data_logical);
            BigEndian::write_u32(&mut data[rec_off + 30..rec_off + 34], data_physical);
            BigEndian::write_u16(&mut data[rec_off + 34..rec_off + 36], rsrc_start_block);
            BigEndian::write_u32(&mut data[rec_off + 36..rec_off + 40], rsrc_logical);
            BigEndian::write_u32(&mut data[rec_off + 40..rec_off + 44], rsrc_physical);
            write_pos = rec_off + 102;
            num_recs += 1;
        }

        // Record 3: File thread — key (parent_id=file_cnid, name="")
        {
            let kl_off = write_pos;
            data[kl_off] = 6;
            data[kl_off + 2..kl_off + 6].copy_from_slice(&file_cnid.to_be_bytes());
            data[kl_off + 6] = 0;
            let rec_off = kl_off + 8;
            data[rec_off] = CATALOG_FILE_THREAD as u8;
            BigEndian::write_u32(&mut data[rec_off + 10..rec_off + 14], 2); // parent=2
            data[rec_off + 14] = 4;
            data[rec_off + 15..rec_off + 19].copy_from_slice(b"File");
            num_recs += 1;
        }

        // Set record count
        BigEndian::write_u16(&mut data[n1 + 10..n1 + 12], num_recs);

        // Write offset table for leaf node
        let mut rec_offsets = Vec::new();
        let mut cur = 14usize;
        // rec 0: root dir = key(12) + data(70) = 82
        rec_offsets.push(cur);
        cur += 82;
        // rec 1: dir thread = key(8) + data(46) = 54
        rec_offsets.push(cur);
        cur += 54;
        // rec 2: file = key(12) + data(102) = 114
        rec_offsets.push(cur);
        cur += 114;
        // rec 3: file thread = key(8) + data(46) = 54
        rec_offsets.push(cur);
        cur += 54;
        // free space
        let lot = n1 + node_size;
        for (i, &off) in rec_offsets.iter().enumerate() {
            BigEndian::write_u16(&mut data[lot - 2 * (i + 1)..lot - 2 * i], off as u16);
        }
        BigEndian::write_u16(
            &mut data[lot - 2 * (rec_offsets.len() + 1)..lot - 2 * rec_offsets.len()],
            cur as u16,
        );

        data
    }

    fn run_catalog_check_on_btree(
        mdb: &HfsMasterDirectoryBlock,
        catalog_data: &[u8],
    ) -> (Vec<FsckIssue>, Vec<FsckIssue>) {
        let header = BTreeHeader::read(catalog_data);
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        let mut files_checked = 0;
        let mut dirs_checked = 0;
        let mut orphaned_threads = 0;
        let mut orphaned_entries = Vec::new();
        check_catalog_consistency(
            mdb,
            catalog_data,
            &header,
            &mut errors,
            &mut warnings,
            &mut files_checked,
            &mut dirs_checked,
            &mut orphaned_threads,
            &mut orphaned_entries,
        );
        (errors, warnings)
    }

    #[test]
    fn test_leof_exceeds_peof_data_fork() {
        let catalog = make_btree_with_file(16, 5000, 4096, 0, 0, 0, 0, 0);
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            errors
                .iter()
                .any(|e| e.code == "LeoFExceedsPeoF" && e.message.contains("data fork")),
            "should detect data LEOF > PEOF: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_leof_exceeds_peof_rsrc_fork() {
        let catalog = make_btree_with_file(16, 0, 0, 3000, 2048, 0, 0, 0);
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            errors
                .iter()
                .any(|e| e.code == "LeoFExceedsPeoF" && e.message.contains("resource fork")),
            "should detect rsrc LEOF > PEOF: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_leof_within_peof_ok() {
        let catalog = make_btree_with_file(16, 4000, 4096, 1000, 2048, 0, 0, 0);
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            !errors.iter().any(|e| e.code == "LeoFExceedsPeoF"),
            "LEOF <= PEOF should not error: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_cnid_below_16_file() {
        let catalog = make_btree_with_file(5, 0, 0, 0, 0, 0, 0, 0); // CNID 5 = reserved
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            errors
                .iter()
                .any(|e| e.code == "InvalidCnidRange" && e.message.contains("file CNID 5")),
            "should detect reserved file CNID: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_cnid_16_file_ok() {
        let catalog = make_btree_with_file(16, 0, 0, 0, 0, 0, 0, 0);
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            !errors
                .iter()
                .any(|e| e.code == "InvalidCnidRange" && e.message.contains("file")),
            "file CNID 16 should be ok: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_cnid_2_root_ok() {
        // Root dir has CNID 2 — should NOT trigger InvalidCnidRange
        let catalog = make_btree_with_file(16, 0, 0, 0, 0, 0, 0, 0);
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            !errors
                .iter()
                .any(|e| e.code == "InvalidCnidRange" && e.message.contains("directory CNID 2")),
            "root dir CNID 2 should not trigger error: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_reserved_fields_nonzero() {
        // reserved_byte=1, data_start_block=1, rsrc_start_block=0
        let catalog = make_btree_with_file(16, 0, 0, 0, 0, 1, 1, 0);
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (_, warnings) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            warnings
                .iter()
                .any(|e| e.code == "ReservedFieldNonZero" && e.message.contains("reserved byte")),
            "should warn about non-zero reserved byte: {:?}",
            warnings.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
        // filStBlk (dataStartBlock) and filRStBlk (rsrcStartBlock) are real
        // fields — non-zero values are normal and should NOT produce warnings.
        assert!(
            !warnings
                .iter()
                .any(|e| e.message.contains("dataStartBlock")
                    || e.message.contains("rsrcStartBlock")),
            "start block fields should not warn: {:?}",
            warnings.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_reserved_fields_zero_ok() {
        let catalog = make_btree_with_file(16, 0, 0, 0, 0, 0, 0, 0);
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (_, warnings) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            !warnings.iter().any(|e| e.code == "ReservedFieldNonZero"),
            "all-zero reserved fields should not warn: {:?}",
            warnings.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    // -----------------------------------------------------------------------
    // Stage 3: Catalog Name & Thread Key Validation tests
    // -----------------------------------------------------------------------

    #[test]
    fn test_catalog_name_valid() {
        // "File" is a valid 4-byte name — should pass
        let catalog = make_btree_with_file(16, 0, 0, 0, 0, 0, 0, 0);
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            !errors.iter().any(|e| e.code == "InvalidCatalogName"),
            "valid name should not error: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_catalog_name_contains_colon() {
        let mut catalog = make_btree_with_file(16, 0, 0, 0, 0, 0, 0, 0);
        // Patch the file name in the catalog — the file record key is at
        // node 1, record 2. The name starts at key offset+7.
        // rec 2 starts at: 14 + 82 (rec0) + 54 (rec1) = 150 within node 1
        // node 1 offset = 512
        // key name at: 512 + 150 + 7 = 669
        // Name is "File" (4 bytes). Replace 'F' with ':'
        catalog[512 + 150 + 7] = 0x3A; // ':' = colon
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            errors
                .iter()
                .any(|e| e.code == "InvalidCatalogName" && e.message.contains("colon")),
            "should detect colon in name: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_catalog_name_empty() {
        let mut catalog = make_btree_with_file(16, 0, 0, 0, 0, 0, 0, 0);
        // Patch the file name length to 0 but keep key_len unchanged so
        // the record data offset stays correct. The name bytes become padding.
        // rec 2 key: at 512 + 150. name_len at offset +6
        catalog[512 + 150 + 6] = 0; // name_len = 0
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            errors
                .iter()
                .any(|e| e.code == "InvalidCatalogName" && e.message.contains("empty")),
            "should detect empty name: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_thread_key_name_zero_ok() {
        // Default btree has thread records with name_len=0 in keys — should be fine
        let catalog = make_btree_with_file(16, 0, 0, 0, 0, 0, 0, 0);
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            !errors.iter().any(|e| e.code == "ThreadNameNotEmpty"),
            "zero-length thread key name should not error: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_thread_key_name_nonzero() {
        let mut catalog = make_btree_with_file(16, 0, 0, 0, 0, 0, 0, 0);
        // Patch the file thread key (record 3) to have name_len=1
        // rec 3 starts at: 14 + 82 + 54 + 114 = 264 within node 1
        // node 1 offset = 512
        // key_len at 512+264, name_len at 512+264+6
        let r3 = 512 + 264;
        catalog[r3] = 7; // key_len = 7 (was 6)
        catalog[r3 + 6] = 1; // name_len = 1
        catalog[r3 + 7] = b'X'; // name byte
        let mut mdb = make_test_mdb();
        mdb.file_count = 1;
        mdb.next_catalog_id = 17;
        let (errors, _) = run_catalog_check_on_btree(&mdb, &catalog);
        assert!(
            errors.iter().any(|e| e.code == "ThreadNameNotEmpty"),
            "non-zero thread key name should error: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_validate_hfs_name_too_long() {
        let name = vec![b'A'; 32];
        assert!(validate_hfs_name(&name).is_some());
        assert!(validate_hfs_name(&name).unwrap().contains("exceeds"));
    }

    // -----------------------------------------------------------------------
    // Stage 4: Directory Structure tests
    // -----------------------------------------------------------------------

    #[test]
    fn test_directory_reaches_root() {
        // CNID 2 (root) → parent 1 (virtual root)
        // CNID 16 → parent 2
        let mut dirs: HashMap<u32, (u32, Vec<u8>, u16)> = HashMap::new();
        dirs.insert(2, (1, b"Root".to_vec(), 1));
        dirs.insert(16, (2, b"Sub".to_vec(), 0));
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        check_directory_structure(&dirs, &mut errors, &mut warnings);
        assert!(
            !errors.iter().any(|e| e.code == "DirectoryLoop"),
            "normal hierarchy should not have loops"
        );
        assert!(
            !warnings.iter().any(|e| e.code == "NestingDepthWarning"),
            "shallow hierarchy should not warn"
        );
    }

    #[test]
    fn test_directory_loop_detected() {
        // CNID 2 (root) → parent 1
        // CNID 16 → parent 17
        // CNID 17 → parent 16  (loop!)
        let mut dirs: HashMap<u32, (u32, Vec<u8>, u16)> = HashMap::new();
        dirs.insert(2, (1, b"Root".to_vec(), 0));
        dirs.insert(16, (17, b"A".to_vec(), 0));
        dirs.insert(17, (16, b"B".to_vec(), 0));
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        check_directory_structure(&dirs, &mut errors, &mut warnings);
        assert!(
            errors.iter().any(|e| e.code == "DirectoryLoop"),
            "should detect directory loop: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_deep_nesting_warning() {
        // Build a 101-level chain: 2 → 16 → 17 → ... → 116
        let mut dirs: HashMap<u32, (u32, Vec<u8>, u16)> = HashMap::new();
        dirs.insert(2, (1, b"Root".to_vec(), 1));
        for i in 0..101u32 {
            let cnid = 16 + i;
            let parent = if i == 0 { 2 } else { 16 + i - 1 };
            dirs.insert(cnid, (parent, b"D".to_vec(), if i < 100 { 1 } else { 0 }));
        }
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        check_directory_structure(&dirs, &mut errors, &mut warnings);
        assert!(
            warnings.iter().any(|e| e.code == "NestingDepthWarning"),
            "should warn about deep nesting: {:?}",
            warnings.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_normal_nesting_ok() {
        // 5-level chain: should not warn
        let mut dirs: HashMap<u32, (u32, Vec<u8>, u16)> = HashMap::new();
        dirs.insert(2, (1, b"Root".to_vec(), 1));
        for i in 0..5u32 {
            let cnid = 16 + i;
            let parent = if i == 0 { 2 } else { 16 + i - 1 };
            dirs.insert(cnid, (parent, b"D".to_vec(), if i < 4 { 1 } else { 0 }));
        }
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        check_directory_structure(&dirs, &mut errors, &mut warnings);
        assert!(
            !warnings.iter().any(|e| e.code == "NestingDepthWarning"),
            "shallow nesting should not warn"
        );
        assert!(!errors.iter().any(|e| e.code == "DirectoryLoop"), "no loop");
    }

    // -----------------------------------------------------------------------
    // Stage 5: Alternate MDB & Embedded HFS+ Wrapper tests
    // -----------------------------------------------------------------------

    fn make_alt_mdb_sector(mdb: &HfsMasterDirectoryBlock) -> [u8; 512] {
        // Build an alt MDB sector matching the primary
        let mut alt = [0u8; 512];
        BigEndian::write_u16(&mut alt[0..2], 0x4244); // signature
        BigEndian::write_u16(&mut alt[14..16], mdb.volume_bitmap_block);
        BigEndian::write_u16(&mut alt[18..20], mdb.total_blocks);
        BigEndian::write_u32(&mut alt[20..24], mdb.block_size);
        BigEndian::write_u16(&mut alt[28..30], mdb.first_alloc_block);
        alt
    }

    #[test]
    fn test_alternate_mdb_matches() {
        let mdb = make_test_mdb();
        let alt = make_alt_mdb_sector(&mdb);
        let mut errors = Vec::new();
        check_alternate_mdb(&mdb, &alt, &mut errors);
        assert!(
            errors.is_empty(),
            "matching alt MDB should not error: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_alternate_mdb_block_size_mismatch() {
        let mdb = make_test_mdb();
        let mut alt = make_alt_mdb_sector(&mdb);
        BigEndian::write_u32(&mut alt[20..24], 8192); // different block size
        let mut errors = Vec::new();
        check_alternate_mdb(&mdb, &alt, &mut errors);
        assert!(
            errors
                .iter()
                .any(|e| e.code == "AlternateMdbMismatch" && e.message.contains("block size")),
            "should detect block size mismatch: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_alternate_mdb_missing_signature_silently_skipped() {
        let mdb = make_test_mdb();
        let alt = [0u8; 512]; // all zeros — no valid MDB signature
        let mut errors = Vec::new();
        check_alternate_mdb(&mdb, &alt, &mut errors);
        // Can't distinguish "missing" from "looked in the wrong place"
        // (partition larger than allocation area), so produce nothing.
        assert!(
            errors.is_empty(),
            "unexpected errors: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_embedded_hfs_plus_valid_wrapper() {
        let mut mdb = make_test_mdb();
        mdb.embedded_signature = 0x482B;
        mdb.embedded_start_block = 10;
        mdb.embedded_block_count = 50;
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        check_embedded_hfs_plus(&mdb, &mut errors, &mut warnings);
        assert!(
            !errors.iter().any(|e| e.code == "EmbeddedHfsPlusInvalid"),
            "valid embedded region should not error: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
        // Should have an informational warning
        assert!(
            warnings
                .iter()
                .any(|e| e.code == "EmbeddedHfsPlusInvalid" && e.message.contains("wrapper")),
            "should warn about HFS wrapper: {:?}",
            warnings.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_embedded_hfs_plus_out_of_range() {
        let mut mdb = make_test_mdb();
        mdb.embedded_signature = 0x482B;
        mdb.embedded_start_block = 80;
        mdb.embedded_block_count = 30; // 80+30=110 > total_blocks=100
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        check_embedded_hfs_plus(&mdb, &mut errors, &mut warnings);
        assert!(
            errors
                .iter()
                .any(|e| e.code == "EmbeddedHfsPlusInvalid" && e.message.contains("exceeds")),
            "should detect out-of-range embedded region: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_embedded_unknown_signature() {
        let mut mdb = make_test_mdb();
        mdb.embedded_signature = 0x1234;
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        check_embedded_hfs_plus(&mdb, &mut errors, &mut warnings);
        assert!(
            errors
                .iter()
                .any(|e| e.code == "EmbeddedHfsPlusInvalid" && e.message.contains("unknown")),
            "should detect unknown embedded signature: {:?}",
            errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    // -----------------------------------------------------------------------
    // Stage 6: Bad Block File Bitmap Cross-Check tests
    // -----------------------------------------------------------------------

    /// Build a minimal extents overflow B-tree with one extent record for the given file_id.
    fn make_extents_btree_with_bad_blocks(
        file_id: u32,
        start_block: u16,
        block_count: u16,
    ) -> Vec<u8> {
        let node_size = 512usize;
        let num_nodes = 4usize;
        let mut data = vec![0u8; node_size * num_nodes];

        // Node 0: Header node
        data[8] = BTREE_HEADER_NODE as u8;
        BigEndian::write_u16(&mut data[10..12], 3); // 3 records

        let hr = 14;
        BigEndian::write_u16(&mut data[hr..hr + 2], 1); // depth = 1
        BigEndian::write_u32(&mut data[hr + 2..hr + 6], 1); // root_node = 1
        BigEndian::write_u32(&mut data[hr + 6..hr + 10], 1); // leaf_records = 1
        BigEndian::write_u32(&mut data[hr + 10..hr + 14], 1); // first_leaf = 1
        BigEndian::write_u32(&mut data[hr + 14..hr + 18], 1); // last_leaf = 1
        BigEndian::write_u16(&mut data[hr + 18..hr + 20], node_size as u16);
        BigEndian::write_u16(&mut data[hr + 20..hr + 22], 7); // max_key_len
        BigEndian::write_u32(&mut data[hr + 22..hr + 26], num_nodes as u32);
        BigEndian::write_u32(&mut data[hr + 26..hr + 30], (num_nodes - 2) as u32);

        let ot = node_size;
        BigEndian::write_u16(&mut data[ot - 2..ot], 14);
        BigEndian::write_u16(&mut data[ot - 4..ot - 2], 0x78);
        BigEndian::write_u16(&mut data[ot - 6..ot - 4], 0xf8);
        BigEndian::write_u16(&mut data[ot - 8..ot - 6], node_size as u16 - 8);

        // Node bitmap: mark nodes 0 and 1
        data[0xf8] = 0b11000000;

        // Node 1: Leaf node with 1 extent record
        let n1 = node_size;
        data[n1 + 8] = BTREE_LEAF_NODE as u8;
        data[n1 + 9] = 1;
        BigEndian::write_u16(&mut data[n1 + 10..n1 + 12], 1);

        // Record 0: key(8 bytes) + 3 extent descriptors(12 bytes) = 20 bytes
        let r0 = n1 + 14;
        data[r0] = 7; // key_len = 7
        data[r0 + 1] = 0x00; // fork_type = data
        BigEndian::write_u32(&mut data[r0 + 2..r0 + 6], file_id);
        BigEndian::write_u16(&mut data[r0 + 6..r0 + 8], 0); // startBlock

        // Record data at even offset: r0 + 1 + 7 = r0+8 (even)
        let rd = r0 + 8;
        // First extent descriptor
        BigEndian::write_u16(&mut data[rd..rd + 2], start_block);
        BigEndian::write_u16(&mut data[rd + 2..rd + 4], block_count);
        // Remaining 2 extents are zero

        // Offset table for leaf
        let lot = n1 + node_size;
        BigEndian::write_u16(&mut data[lot - 2..lot], 14);
        BigEndian::write_u16(&mut data[lot - 4..lot - 2], (14 + 20) as u16);

        data
    }

    #[test]
    fn test_no_bad_block_file_ok() {
        // No extents overflow → no bad block issues
        let mdb = make_test_mdb();
        let catalog = make_minimal_btree(512);
        let bitmap = vec![0u8; 13]; // 100 bits
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        let header = BTreeHeader::read(&catalog);
        check_extents_and_bitmap(
            &mdb,
            &catalog,
            &header,
            &bitmap,
            None,
            &mut errors,
            &mut warnings,
        );
        assert!(
            !warnings
                .iter()
                .any(|e| e.code == "BadBlockExtentNotInBitmap"),
            "no bad block file should produce no warnings"
        );
    }

    #[test]
    fn test_bad_block_extents_in_bitmap_ok() {
        let mdb = make_test_mdb();
        let catalog = make_minimal_btree(512);
        // Bad block file (CNID 5) claims blocks 50-52
        let ext_data = make_extents_btree_with_bad_blocks(5, 50, 3);
        // Bitmap: mark blocks 50-52 as allocated
        let mut bitmap = vec![0u8; 13]; // 100 bits
        for b in 50..53u32 {
            bitmap_set_bit_be(&mut bitmap, b);
        }
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        let header = BTreeHeader::read(&catalog);
        check_extents_and_bitmap(
            &mdb,
            &catalog,
            &header,
            &bitmap,
            Some(&ext_data),
            &mut errors,
            &mut warnings,
        );
        assert!(
            !warnings
                .iter()
                .any(|e| e.code == "BadBlockExtentNotInBitmap"),
            "allocated bad blocks should not warn: {:?}",
            warnings.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_bad_block_extent_not_in_bitmap() {
        let mdb = make_test_mdb();
        let catalog = make_minimal_btree(512);
        // Bad block file (CNID 5) claims blocks 50-52
        let ext_data = make_extents_btree_with_bad_blocks(5, 50, 3);
        // Bitmap: block 50 is free (not allocated)
        let bitmap = vec![0u8; 13]; // all free
        let mut errors = Vec::new();
        let mut warnings = Vec::new();
        let header = BTreeHeader::read(&catalog);
        check_extents_and_bitmap(
            &mdb,
            &catalog,
            &header,
            &bitmap,
            Some(&ext_data),
            &mut errors,
            &mut warnings,
        );
        assert!(
            warnings
                .iter()
                .any(|e| e.code == "BadBlockExtentNotInBitmap"),
            "free bad block should warn: {:?}",
            warnings.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_map_node_valid_no_continuation() {
        // Most B-trees have no continuation map nodes (node 0 fLink = 0).
        // This is the common case — should produce no errors.
        let node_size = 512;
        let mut data = vec![0u8; node_size * 4];
        // Node 0: header node, fLink = 0 (no continuation)
        data[8] = BTREE_HEADER_NODE as u8;
        BigEndian::write_u16(&mut data[10..12], 3);
        // Minimal offset table for header node
        let ot = node_size;
        BigEndian::write_u16(&mut data[ot - 2..ot], 14);
        BigEndian::write_u16(&mut data[ot - 4..ot - 2], 0x78);
        BigEndian::write_u16(&mut data[ot - 6..ot - 4], 0xf8);
        BigEndian::write_u16(&mut data[ot - 8..ot - 6], 0x1f8);

        let mut errors = Vec::new();
        check_map_nodes(&data, node_size, &mut errors);
        assert!(errors.is_empty(), "no map node errors expected");
    }

    #[test]
    fn test_map_node_bad_kind_detected() {
        let node_size = 512;
        let mut data = vec![0u8; node_size * 4];
        // Node 0: header node, fLink = 2 (points to map node at index 2)
        BigEndian::write_u32(&mut data[0..4], 2);
        data[8] = BTREE_HEADER_NODE as u8;
        BigEndian::write_u16(&mut data[10..12], 3);

        // Node 2: should be map node but has wrong kind (leaf)
        let n2 = 2 * node_size;
        data[n2 + 8] = BTREE_LEAF_NODE as u8; // wrong!
        BigEndian::write_u16(&mut data[n2 + 10..n2 + 12], 1);
        // Correct offset table
        BigEndian::write_u16(&mut data[n2 + node_size - 2..n2 + node_size], 14);
        BigEndian::write_u16(
            &mut data[n2 + node_size - 4..n2 + node_size - 2],
            (node_size - 4) as u16,
        );

        let mut errors = Vec::new();
        check_map_nodes(&data, node_size, &mut errors);
        assert_eq!(errors.len(), 1, "should detect bad map node kind");
        assert_eq!(errors[0].code, "MapNodeBadStructure");
        assert!(errors[0].repairable);
    }

    #[test]
    fn test_map_node_repair() {
        let node_size = 512;
        let mut data = vec![0u8; node_size * 4];
        // Node 0: header, fLink → node 2
        BigEndian::write_u32(&mut data[0..4], 2);
        data[8] = BTREE_HEADER_NODE as u8;
        BigEndian::write_u16(&mut data[10..12], 3);

        // Node 2: broken map node (wrong kind, wrong record count, wrong offsets)
        let n2 = 2 * node_size;
        data[n2 + 8] = BTREE_INDEX_NODE as u8; // wrong kind
        BigEndian::write_u16(&mut data[n2 + 10..n2 + 12], 5); // wrong record count
        BigEndian::write_u16(&mut data[n2 + node_size - 2..n2 + node_size], 99); // wrong offset

        let mut report = RepairReport {
            fixes_applied: Vec::new(),
            fixes_failed: Vec::new(),
            unrepairable_count: 0,
        };
        repair_map_nodes(&mut data, node_size, &mut report);

        // Verify repairs
        assert_eq!(data[n2 + 8] as i8, BTREE_MAP_NODE);
        assert_eq!(BigEndian::read_u16(&data[n2 + 10..n2 + 12]), 1);
        assert_eq!(
            BigEndian::read_u16(&data[n2 + node_size - 2..n2 + node_size]),
            14
        );
        assert_eq!(
            BigEndian::read_u16(&data[n2 + node_size - 4..n2 + node_size - 2]),
            (node_size - 4) as u16
        );
        assert_eq!(report.fixes_applied.len(), 1);

        // Check passes after repair
        let mut errors = Vec::new();
        check_map_nodes(&data, node_size, &mut errors);
        assert!(
            errors.is_empty(),
            "should be clean after repair: {:?}",
            errors
                .iter()
                .map(|e| e.message.as_str())
                .collect::<Vec<_>>()
        );
    }

    /// Helper: build a minimal B-tree with a header node and one leaf node.
    /// Returns (data, node_size). Node 0 = header, node 1 = leaf (root).
    /// The leaf has one dummy catalog record.
    fn make_minimal_btree(node_size: usize) -> Vec<u8> {
        let num_nodes = 4usize;
        let mut data = vec![0u8; node_size * num_nodes];

        // Node 0: Header node
        data[8] = BTREE_HEADER_NODE as u8; // kind
        BigEndian::write_u16(&mut data[10..12], 3); // 3 records

        // B-tree header record at offset 14
        let hr = 14;
        BigEndian::write_u16(&mut data[hr..hr + 2], 1); // depth = 1
        BigEndian::write_u32(&mut data[hr + 2..hr + 6], 1); // root_node = 1
        BigEndian::write_u32(&mut data[hr + 6..hr + 10], 1); // leaf_records = 1
        BigEndian::write_u32(&mut data[hr + 10..hr + 14], 1); // first_leaf = 1
        BigEndian::write_u32(&mut data[hr + 14..hr + 18], 1); // last_leaf = 1
        BigEndian::write_u16(&mut data[hr + 18..hr + 20], node_size as u16); // node_size
        BigEndian::write_u16(&mut data[hr + 20..hr + 22], 37); // max_key_len
        BigEndian::write_u32(&mut data[hr + 22..hr + 26], num_nodes as u32); // total_nodes
        BigEndian::write_u32(&mut data[hr + 26..hr + 30], (num_nodes - 2) as u32); // free_nodes

        // Offset table for header node
        let ot = node_size;
        BigEndian::write_u16(&mut data[ot - 2..ot], 14); // record 0
        BigEndian::write_u16(&mut data[ot - 4..ot - 2], 0x78); // record 1
        BigEndian::write_u16(&mut data[ot - 6..ot - 4], 0xf8); // record 2
        BigEndian::write_u16(&mut data[ot - 8..ot - 6], node_size as u16 - 8); // free space

        // Node bitmap (record 2 at offset 0xf8): mark nodes 0 and 1 as allocated
        data[0xf8] = 0b11000000;

        // Node 1: Leaf node with 1 dummy record
        let n1 = node_size;
        data[n1 + 8] = BTREE_LEAF_NODE as u8; // kind = leaf
        data[n1 + 9] = 1; // height = 1
        BigEndian::write_u16(&mut data[n1 + 10..n1 + 12], 1); // 1 record

        // Dummy catalog dir record: key(8 bytes) + dir data(70 bytes) = 78 bytes
        let r0 = n1 + 14;
        data[r0] = 6; // key_len = 6
        BigEndian::write_u32(&mut data[r0 + 2..r0 + 6], 1); // parent_id = 1
        data[r0 + 8] = CATALOG_DIR as u8; // type = directory
        BigEndian::write_u32(&mut data[r0 + 14..r0 + 18], 2); // dirID = 2

        // Offset table for leaf
        let lot = n1 + node_size;
        BigEndian::write_u16(&mut data[lot - 2..lot], 14); // record 0
        BigEndian::write_u16(&mut data[lot - 4..lot - 2], (14 + 78) as u16); // free space

        data
    }

    #[test]
    fn test_node_bitmap_consistent() {
        let node_size = 512;
        let data = make_minimal_btree(node_size);
        let header = BTreeHeader::read(&data);
        let mut errors = Vec::new();
        check_node_bitmap_consistency(&data, &header, &mut errors);
        assert!(
            errors.is_empty(),
            "consistent bitmap should have no errors: {:?}",
            errors
                .iter()
                .map(|e| e.message.as_str())
                .collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_node_bitmap_missing_detected() {
        let node_size = 512;
        let mut data = make_minimal_btree(node_size);

        // Clear the bitmap bit for node 1 (leaf/root) — it's still referenced
        // The bitmap is at offset 0xf8 in node 0. Bit 0 = node 0, bit 1 = node 1.
        data[0xf8] = 0b10000000; // only node 0 allocated, node 1 missing

        let header = BTreeHeader::read(&data);
        let mut errors = Vec::new();
        check_node_bitmap_consistency(&data, &header, &mut errors);
        assert_eq!(errors.len(), 1);
        assert_eq!(errors[0].code, "NodeBitmapMissing");
        assert!(errors[0].repairable);
        assert!(errors[0].message.contains("node 1"));
    }

    #[test]
    fn test_node_bitmap_missing_repaired() {
        let node_size = 512;
        let mut data = make_minimal_btree(node_size);

        // Clear bitmap bit for node 1
        data[0xf8] = 0b10000000;

        let mut report = RepairReport {
            fixes_applied: Vec::new(),
            fixes_failed: Vec::new(),
            unrepairable_count: 0,
        };
        repair_node_bitmap(&mut data, node_size, &mut report);

        // Verify node 1 is now allocated
        assert_eq!(
            data[0xf8] & 0b01000000,
            0b01000000,
            "node 1 bit should be set"
        );
        assert_eq!(report.fixes_applied.len(), 1);

        // Verify header free_nodes was decremented
        let header = BTreeHeader::read(&data);
        // Original: 2 free nodes (nodes 2,3). After fixing node 1: still 2 free
        // because node 1 was already counted as used. Actually free_nodes was set
        // to num_nodes - 2 = 2. After repair, it saturating_sub(1) = 1.
        assert_eq!(header.free_nodes, 1);

        // Check should now pass
        let mut errors = Vec::new();
        check_node_bitmap_consistency(&data, &header, &mut errors);
        assert!(errors.is_empty());
    }

    /// Build a leaf node with two catalog dir records at given parent_ids.
    /// Returns the modified btree data. Uses make_minimal_btree as base
    /// but replaces the leaf with two records.
    fn make_btree_with_two_leaf_records(
        node_size: usize,
        parent_id_0: u32,
        name_0: &[u8],
        parent_id_1: u32,
        name_1: &[u8],
    ) -> Vec<u8> {
        let mut data = make_minimal_btree(node_size);

        // Build two dir records in the leaf node (node 1)
        let n1 = node_size;
        BigEndian::write_u16(&mut data[n1 + 10..n1 + 12], 2); // 2 records

        // Record 0: key + dir data
        let r0 = n1 + 14;
        let key_len_0 = 1 + 4 + 1 + name_0.len(); // reserved + parent_id + name_len + name
        data[r0] = key_len_0 as u8;
        data[r0 + 1] = 0; // reserved
        BigEndian::write_u32(&mut data[r0 + 2..r0 + 6], parent_id_0);
        data[r0 + 6] = name_0.len() as u8;
        data[r0 + 7..r0 + 7 + name_0.len()].copy_from_slice(name_0);
        let mut key_total_0 = 1 + key_len_0;
        if !key_total_0.is_multiple_of(2) {
            key_total_0 += 1; // even alignment
        }
        let data_off_0 = r0 + key_total_0;
        data[data_off_0] = CATALOG_DIR as u8;
        BigEndian::write_u32(&mut data[data_off_0 + 6..data_off_0 + 10], 2); // dirID
        let rec0_len = key_total_0 + 70;

        // Record 1: key + dir data
        let r1 = r0 + rec0_len;
        let key_len_1 = 1 + 4 + 1 + name_1.len();
        data[r1] = key_len_1 as u8;
        data[r1 + 1] = 0;
        BigEndian::write_u32(&mut data[r1 + 2..r1 + 6], parent_id_1);
        data[r1 + 6] = name_1.len() as u8;
        data[r1 + 7..r1 + 7 + name_1.len()].copy_from_slice(name_1);
        let mut key_total_1 = 1 + key_len_1;
        if !key_total_1.is_multiple_of(2) {
            key_total_1 += 1;
        }
        let data_off_1 = r1 + key_total_1;
        data[data_off_1] = CATALOG_DIR as u8;
        BigEndian::write_u32(&mut data[data_off_1 + 6..data_off_1 + 10], 3);
        let rec1_len = key_total_1 + 70;

        // Offset table
        let lot = n1 + node_size;
        BigEndian::write_u16(&mut data[lot - 2..lot], 14); // record 0
        BigEndian::write_u16(&mut data[lot - 4..lot - 2], (14 + rec0_len) as u16); // record 1
        BigEndian::write_u16(
            &mut data[lot - 6..lot - 4],
            (14 + rec0_len + rec1_len) as u16,
        ); // free space

        // Update header leaf_records
        let hr = 14;
        BigEndian::write_u32(&mut data[hr + 6..hr + 10], 2); // leaf_records = 2

        data
    }

    /// Add leaf node 2 holding one record with `parent_id`, chained after
    /// leaf 1 (which the minimal tree fills with parent_id 1).
    fn chain_second_leaf(data: &mut [u8], node_size: usize, parent_id: u32) {
        let n1 = node_size;
        BigEndian::write_u32(&mut data[n1..n1 + 4], 2); // leaf 1 -> leaf 2
        let n2 = 2 * node_size;
        data[n2 + 8] = BTREE_LEAF_NODE as u8;
        data[n2 + 9] = 1;
        BigEndian::write_u16(&mut data[n2 + 10..n2 + 12], 1);
        let r0 = n2 + 14;
        data[r0] = 6;
        BigEndian::write_u32(&mut data[r0 + 2..r0 + 6], parent_id);
        data[r0 + 8] = CATALOG_DIR as u8;
        BigEndian::write_u32(&mut data[r0 + 14..r0 + 18], 9);
        let lot = n2 + node_size;
        BigEndian::write_u16(&mut data[lot - 2..lot], 14);
        BigEndian::write_u16(&mut data[lot - 4..lot - 2], 14 + 78);
        data[0xf8] |= 0b00100000; // node 2 allocated
        BigEndian::write_u32(&mut data[14 + 14..14 + 18], 2); // last_leaf = 2
    }

    /// H5: keys were only compared inside a node, so a leaf whose keys sort
    /// below the previous leaf's passed fsck.
    #[test]
    fn keys_out_of_order_across_leaves_are_detected() {
        let node_size = 512;
        let mut data = make_minimal_btree(node_size);
        chain_second_leaf(&mut data, node_size, 0); // 0 < 1: chain runs backwards
        let header = BTreeHeader::read(&data);
        let mut errors = Vec::new();
        check_key_ordering(&data, &header, &mut errors);
        assert_eq!(errors.len(), 1, "{errors:?}");
        assert_eq!(errors[0].code, "KeysOutOfOrder");
        assert!(
            errors[0].message.contains("next leaf"),
            "{}",
            errors[0].message
        );

        let mut data = make_minimal_btree(node_size);
        chain_second_leaf(&mut data, node_size, 5); // 1 < 5: fine
        let header = BTreeHeader::read(&data);
        let mut errors = Vec::new();
        check_key_ordering(&data, &header, &mut errors);
        assert!(errors.is_empty(), "{errors:?}");
    }

    /// H5: an index record whose key sorts above its child's first key sends
    /// every lookup for that range into the wrong leaf.
    #[test]
    fn index_separator_above_its_child_is_detected() {
        let node_size = 512;
        let mut data = make_minimal_btree(node_size);
        let n3 = 3 * node_size;
        data[n3 + 8] = crate::hfs_common::BTREE_INDEX_NODE as u8;
        data[n3 + 9] = 2;
        BigEndian::write_u16(&mut data[n3 + 10..n3 + 12], 1);
        let r0 = n3 + 14;
        data[r0] = 6; // key: reserved + parent 9 + empty name
        BigEndian::write_u32(&mut data[r0 + 2..r0 + 6], 9);
        BigEndian::write_u32(&mut data[r0 + 8..r0 + 12], 1); // child = leaf 1 (parent 1)
        let lot = n3 + node_size;
        BigEndian::write_u16(&mut data[lot - 2..lot], 14);
        BigEndian::write_u16(&mut data[lot - 4..lot - 2], 14 + 12);
        data[0xf8] |= 0b00010000; // node 3 allocated
        BigEndian::write_u16(&mut data[14..16], 2); // depth 2
        BigEndian::write_u32(&mut data[14 + 2..14 + 6], 3); // root = 3
        let header = BTreeHeader::read(&data);
        let mut errors = Vec::new();
        check_key_ordering(&data, &header, &mut errors);
        assert_eq!(errors.len(), 1, "{errors:?}");
        assert!(
            errors[0].message.contains("index node 3"),
            "{}",
            errors[0].message
        );
    }

    #[test]
    fn test_keys_in_order() {
        let node_size = 512;
        // parent_id 1 < parent_id 5 → already sorted
        let data = make_btree_with_two_leaf_records(node_size, 1, b"", 5, b"");
        let header = BTreeHeader::read(&data);
        let mut errors = Vec::new();
        check_key_ordering(&data, &header, &mut errors);
        assert!(
            errors.is_empty(),
            "sorted keys should have no errors: {:?}",
            errors
                .iter()
                .map(|e| e.message.as_str())
                .collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_keys_out_of_order_detected() {
        let node_size = 512;
        // parent_id 10 > parent_id 1 → out of order (record 0 has higher key)
        let data = make_btree_with_two_leaf_records(node_size, 10, b"", 1, b"");
        let header = BTreeHeader::read(&data);
        let mut errors = Vec::new();
        check_key_ordering(&data, &header, &mut errors);
        assert_eq!(errors.len(), 1);
        assert_eq!(errors[0].code, "KeysOutOfOrder");
        assert!(errors[0].repairable);
    }

    #[test]
    fn test_keys_out_of_order_by_name() {
        let node_size = 512;
        // Same parent_id but name "Zebra" > "Apple" → out of order
        let data = make_btree_with_two_leaf_records(node_size, 2, b"Zebra", 2, b"Apple");
        let header = BTreeHeader::read(&data);
        let mut errors = Vec::new();
        check_key_ordering(&data, &header, &mut errors);
        assert_eq!(errors.len(), 1);
        assert_eq!(errors[0].code, "KeysOutOfOrder");
    }

    #[test]
    fn test_keys_out_of_order_repaired() {
        let node_size = 512;
        let mut data = make_btree_with_two_leaf_records(node_size, 10, b"", 1, b"");

        let mut report = RepairReport {
            fixes_applied: Vec::new(),
            fixes_failed: Vec::new(),
            unrepairable_count: 0,
        };
        repair_key_ordering(&mut data, node_size, &mut report);
        assert_eq!(report.fixes_applied.len(), 1);

        // Verify check passes after repair
        let header = BTreeHeader::read(&data);
        let mut errors = Vec::new();
        check_key_ordering(&data, &header, &mut errors);
        assert!(
            errors.is_empty(),
            "should be clean after repair: {:?}",
            errors
                .iter()
                .map(|e| e.message.as_str())
                .collect::<Vec<_>>()
        );

        // Verify the records are now in correct order: parent_id 1 first, then 10
        let n1 = node_size;
        let node = &data[n1..n1 + node_size];
        let (s0, _) = btree_record_range(node, node_size, 0);
        let (s1, _) = btree_record_range(node, node_size, 1);
        let pid0 = BigEndian::read_u32(&node[s0 + 2..s0 + 6]);
        let pid1 = BigEndian::read_u32(&node[s1 + 2..s1 + 6]);
        assert_eq!(pid0, 1, "first record should have parent_id 1");
        assert_eq!(pid1, 10, "second record should have parent_id 10");
    }

    #[test]
    fn test_fsck_blank_volume_empty_catalog() {
        // A blank HFS volume with no files may have an empty catalog B-tree.
        // This should NOT be reported as an error.
        let mdb = make_test_mdb(); // file_count=0, folder_count=0
        let bitmap = vec![0u8; 16];
        let catalog_data: &[u8] = &[];
        let result = check_hfs_integrity(&mdb, catalog_data, &bitmap, None, None, None);
        assert!(
            result.is_clean(),
            "blank volume with empty catalog should be clean, got errors: {:?}",
            result.errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_fsck_blank_volume_zeroed_catalog() {
        // A blank HFS volume whose catalog is allocated but zeroed out.
        // node_size reads as 0 — should not be flagged on an empty volume.
        let mdb = make_test_mdb();
        let bitmap = vec![0u8; 16];
        let catalog_data = vec![0u8; 512];
        let result = check_hfs_integrity(&mdb, &catalog_data, &bitmap, None, None, None);
        assert!(
            result.is_clean(),
            "blank volume with zeroed catalog should be clean, got errors: {:?}",
            result.errors.iter().map(|e| &e.message).collect::<Vec<_>>()
        );
    }

    #[test]
    fn test_fsck_nonempty_volume_zeroed_catalog_is_error() {
        // A volume that claims to have files but has a zeroed catalog IS an error.
        let mut mdb = make_test_mdb();
        mdb.file_count = 5;
        let bitmap = vec![0u8; 16];
        let catalog_data = vec![0u8; 512];
        let result = check_hfs_integrity(&mdb, &catalog_data, &bitmap, None, None, None);
        assert!(
            !result.is_clean(),
            "non-empty volume with zeroed catalog should have errors"
        );
    }
}