fstool 0.3.0

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
//! HFS+ in-place read/write file handle.
//!
//! Backs [`crate::fs::Filesystem::open_file_rw`] for HFS+ volumes.
//!
//! ## Journal handling — Path A (real transactions)
//!
//! On a journaled volume, user-data writes are buffered in an in-memory
//! `journal::JournalLog` until `sync()`. On sync we emit one
//! journal transaction holding every modified disk block:
//!
//!   1. Write the block-list-header + block_info array + block data
//!      into the journal buffer at `end`.
//!   2. Persist the journal header with the new `end` value.
//!   3. Apply the buffered writes to their target offsets on disk.
//!   4. Persist the journal header with `start = end`.
//!
//! A crash between steps 2 and 4 leaves a valid journal entry that
//! the next open replays. Replay is idempotent. On open we always
//! drain any unreplayed work via `journal::replay` before
//! attaching the handle, so the caller never sees a half-applied
//! transaction.
//!
//! On an unjournaled volume the journal log is `None` and writes go
//! straight to disk; metadata is persisted by `sync()` via
//! [`super::HfsPlus::flush`].
//!
//! ### Known limitation
//!
//! The metadata rewrite inside [`super::HfsPlus::flush`] (catalog
//! B-tree, extents-overflow, allocation bitmap, volume header) is
//! *not* journaled. A crash between the journal commit and the
//! metadata flush leaves the user data on disk but the catalog still
//! describing the file's previous size / extents. fsck will report a
//! leak (allocated-but-uncatalogued blocks) but no corruption.
//!
//! ## Lifetime
//!
//! The handle holds `&'a mut HfsPlus` and `&'a mut dyn BlockDevice`
//! for its full lifetime, matching the trait signature.

use std::io::{self, Read, Seek, SeekFrom, Write};

use super::HfsPlus;
use super::catalog::{REC_FILE, UniStr, mode};
use super::extents::FORK_DATA;
use super::journal::JournalLog;
use super::volume_header::{ExtentDescriptor, FORK_DATA_SIZE, FORK_EXTENT_COUNT, ForkData};
use super::writer::OwnedKey;
use crate::Result;
use crate::block::BlockDevice;
use crate::fs::FileHandle;

/// A read/write file handle on an HFS+ regular file. Reads / writes
/// translate fork-relative byte offsets into allocation-block I/O via
/// the file's extent list (inline + extents-overflow). Growth allocates
/// new runs from the volume bitmap.
pub struct HfsPlusFileHandle<'a> {
    fs: &'a mut HfsPlus,
    dev: &'a mut dyn BlockDevice,
    /// OwnedKey of the catalog entry that owns this file. Used to look
    /// the body up in the in-memory writer on every metadata refresh.
    cat_key: OwnedKey,
    /// CNID of the file we're editing. Needed to drive overflow-record
    /// updates.
    file_id: u32,
    /// The file's allocation runs, in fork order. Inline (first 8) plus
    /// any spilled into extents-overflow are merged into a single flat
    /// list for simple addressing during reads / writes.
    runs: Vec<ExtentDescriptor>,
    /// Logical length in bytes (after any pending writes).
    file_size: u64,
    /// Read / write cursor.
    pos: u64,
    /// True once mutations have made the on-disk catalog stale. Cleared
    /// on `sync` / `Drop`.
    dirty: bool,
    /// In-memory journal log on a journaled volume. `None` on
    /// unjournaled images. Buffers every user-data write until `sync`
    /// commits the transaction.
    journal: Option<JournalLog>,
}

impl<'a> HfsPlusFileHandle<'a> {
    /// Construct a handle for the file at `cat_key`. Caller has already
    /// resolved the entry to a non-hardlink non-symlink regular file,
    /// assembled its merged run list, replayed any outstanding journal
    /// transactions, and loaded a fresh [`JournalLog`] if applicable.
    pub(super) fn new(
        fs: &'a mut HfsPlus,
        dev: &'a mut dyn BlockDevice,
        cat_key: OwnedKey,
        file_id: u32,
        runs: Vec<ExtentDescriptor>,
        file_size: u64,
        journal: Option<JournalLog>,
    ) -> Self {
        Self {
            fs,
            dev,
            cat_key,
            file_id,
            runs,
            file_size,
            pos: 0,
            dirty: false,
            journal,
        }
    }

    /// Allocation block size in bytes.
    fn block_size(&self) -> u64 {
        u64::from(self.fs.volume_header.block_size)
    }

    /// Translate a fork-relative byte offset to (device byte offset,
    /// bytes available in this run). Returns `None` past EOF (i.e. past
    /// the last allocated block).
    fn locate(&self, fork_off: u64) -> Option<(u64, u64)> {
        let bs = self.block_size();
        let mut cursor: u64 = 0;
        for run in &self.runs {
            let run_bytes = u64::from(run.block_count) * bs;
            if fork_off < cursor + run_bytes {
                let into_run = fork_off - cursor;
                let dev_off = u64::from(run.start_block) * bs + into_run;
                let remaining = run_bytes - into_run;
                return Some((dev_off, remaining));
            }
            cursor += run_bytes;
        }
        None
    }

    /// Total bytes covered by the current run list.
    fn allocated_bytes(&self) -> u64 {
        let bs = self.block_size();
        self.runs
            .iter()
            .map(|r| u64::from(r.block_count) * bs)
            .sum()
    }

    /// Total allocation blocks across the run list.
    fn total_blocks(&self) -> u32 {
        self.runs
            .iter()
            .map(|r| r.block_count)
            .fold(0u32, |a, b| a.saturating_add(b))
    }

    /// Read up to `buf.len()` bytes from the current cursor; never past EOF.
    fn read_inner(&mut self, buf: &mut [u8]) -> io::Result<usize> {
        if self.pos >= self.file_size || buf.is_empty() {
            return Ok(0);
        }
        let remaining_in_file = self.file_size - self.pos;
        let want = (buf.len() as u64).min(remaining_in_file) as usize;
        let mut done: usize = 0;
        while done < want {
            let (dev_off, in_run) = self.locate(self.pos + done as u64).ok_or_else(|| {
                io::Error::other(format!(
                    "hfs+: file_size {} extends past allocated runs",
                    self.file_size
                ))
            })?;
            let chunk = (want - done).min(in_run as usize);
            self.dev_read_at(dev_off, &mut buf[done..done + chunk])
                .map_err(|e| io::Error::other(e.to_string()))?;
            done += chunk;
        }
        self.pos += done as u64;
        Ok(done)
    }

    /// Positional read that consults the journal buffer first (so a
    /// `write` -> `read` round trip within the same handle sees the
    /// pending data even though we have not yet committed). Bytes not
    /// covered by any pending block fall through to the device.
    fn dev_read_at(&mut self, off: u64, buf: &mut [u8]) -> Result<()> {
        if let Some(journal) = self.journal.as_ref() {
            let mut idx = 0;
            while idx < buf.len() {
                let cur = off + idx as u64;
                if let Some((block_off, data)) = journal.lookup(cur) {
                    let inside = (cur - block_off) as usize;
                    let take = (buf.len() - idx).min(data.len() - inside);
                    buf[idx..idx + take].copy_from_slice(&data[inside..inside + take]);
                    idx += take;
                } else {
                    // Read from disk up to the next pending byte.
                    let mut stretch = buf.len() - idx;
                    for j in 0..stretch {
                        if journal.lookup(cur + j as u64).is_some() {
                            stretch = j;
                            break;
                        }
                    }
                    if stretch == 0 {
                        continue;
                    }
                    self.dev.read_at(cur, &mut buf[idx..idx + stretch])?;
                    idx += stretch;
                }
            }
            Ok(())
        } else {
            self.dev.read_at(off, buf)
        }
    }

    /// Positional write that prefers the journal buffer on journaled
    /// volumes (the write is buffered until `sync`). On unjournaled
    /// volumes we still go straight to disk.
    ///
    /// Journal commits must describe each block as a whole multiple of
    /// the journal sector size (512 B). A partial-sector write would
    /// be padded with zeros at commit time, clobbering the original
    /// surrounding bytes. To avoid that, we expand sub-sector writes
    /// here by reading the affected sector(s) from disk (or from
    /// previously-pending journal entries) and patching them in
    /// memory, then handing the sector-aligned merged buffer to the
    /// journal.
    fn dev_write_at(&mut self, off: u64, data: &[u8]) -> Result<()> {
        if self.journal.is_none() {
            return self.dev.write_at(off, data);
        }
        const SECTOR: u64 = super::journal::JOURNAL_SECTOR;
        let end = off + data.len() as u64;
        let aligned_start = off / SECTOR * SECTOR;
        let aligned_end = end.div_ceil(SECTOR) * SECTOR;
        let aligned_len = (aligned_end - aligned_start) as usize;

        let merged = if aligned_start == off && aligned_len == data.len() {
            // Already sector-aligned end-to-end; nothing to read.
            data.to_vec()
        } else {
            let mut buf = vec![0u8; aligned_len];
            // Read the existing aligned range from disk (with journal
            // overlay) so we don't zero out neighbouring bytes.
            self.dev_read_at(aligned_start, &mut buf)?;
            let dst_start = (off - aligned_start) as usize;
            buf[dst_start..dst_start + data.len()].copy_from_slice(data);
            buf
        };

        let journal = self
            .journal
            .as_mut()
            .expect("journal presence checked above");
        // `merged` already starts at `aligned_start` and is whole sectors.
        journal.add(aligned_start, merged);
        self.dirty = true;
        Ok(())
    }

    /// Append new runs to cover at least `needed_bytes` bytes total
    /// across the run list. Newly-allocated blocks are zeroed on disk
    /// so reads of unwritten holes return zeros.
    fn ensure_capacity(&mut self, needed_bytes: u64) -> Result<()> {
        let bs = self.block_size();
        let have_bytes = self.allocated_bytes();
        if needed_bytes <= have_bytes {
            return Ok(());
        }
        let extra_bytes = needed_bytes - have_bytes;
        let mut extra_blocks = u32::try_from(extra_bytes.div_ceil(bs)).map_err(|_| {
            crate::Error::InvalidArgument(
                "hfs+ handle: capacity grow overflows u32 block count".into(),
            )
        })?;
        // Two-phase to avoid the alternating borrow between
        // `self.fs.writer` (allocation bookkeeping) and `self.dev_write_at`
        // (which needs `self` as a whole): first stage every run, then
        // drop the writer borrow, then journal/apply the zero-fills.
        let mut staged: Vec<ExtentDescriptor> = Vec::new();
        {
            let writer = self.fs.writer.as_mut().ok_or_else(|| {
                crate::Error::InvalidArgument("hfs+: volume opened read-only".into())
            })?;
            while extra_blocks > 0 {
                let run = writer.allocate_largest_run(extra_blocks)?;
                extra_blocks -= run.block_count;
                staged.push(run);
            }
        }
        for run in staged {
            // Zero the freshly-allocated run so reads of holes return
            // zero. (A block freed by `remove` and re-handed-out may
            // still carry stale bytes.) On a journaled volume the
            // zero-fill is buffered into the journal alongside the
            // user write — replay will re-zero on recovery.
            let zero = vec![0u8; (u64::from(run.block_count) * bs) as usize];
            let off = u64::from(run.start_block) * bs;
            self.dev_write_at(off, &zero)?;
            self.runs.push(run);
        }
        Ok(())
    }

    /// Shrink the run list so it covers no more than `cap_bytes` bytes,
    /// freeing the trailing blocks. The blocks-actually-needed count is
    /// always rounded up so a partial-block tail stays allocated.
    fn shrink_to(&mut self, cap_bytes: u64) -> Result<()> {
        let bs = self.block_size();
        let needed_blocks_u64 = cap_bytes.div_ceil(bs);
        let needed_blocks = u32::try_from(needed_blocks_u64).map_err(|_| {
            crate::Error::InvalidArgument("hfs+ handle: shrink-target overflows u32 blocks".into())
        })?;
        let mut have: u32 = self.total_blocks();
        let writer =
            self.fs.writer.as_mut().ok_or_else(|| {
                crate::Error::InvalidArgument("hfs+: volume opened read-only".into())
            })?;
        while have > needed_blocks {
            let last = self
                .runs
                .last_mut()
                .ok_or_else(|| crate::Error::InvalidImage("hfs+ handle: run list empty".into()))?;
            let surplus = have - needed_blocks;
            if last.block_count <= surplus {
                let dead = *last;
                writer.free(dead.start_block, dead.block_count);
                have -= dead.block_count;
                self.runs.pop();
            } else {
                // Trim the tail of this run.
                let new_count = last.block_count - surplus;
                let freed_start = last.start_block + new_count;
                writer.free(freed_start, surplus);
                last.block_count = new_count;
                have = needed_blocks;
            }
        }
        Ok(())
    }

    /// Write `data` at fork-relative offset `off`. The runs must already
    /// cover `off + data.len()` bytes.
    fn write_into_runs(&mut self, off: u64, data: &[u8]) -> io::Result<()> {
        let mut done = 0usize;
        while done < data.len() {
            let (dev_off, in_run) = self.locate(off + done as u64).ok_or_else(|| {
                io::Error::other("hfs+: write past allocated capacity (internal)")
            })?;
            let chunk = (data.len() - done).min(in_run as usize);
            self.dev_write_at(dev_off, &data[done..done + chunk])
                .map_err(|e| io::Error::other(e.to_string()))?;
            done += chunk;
        }
        Ok(())
    }

    /// Zero the bytes in `[start, end)`. The runs must already cover
    /// that range.
    fn zero_range(&mut self, start: u64, end: u64) -> io::Result<()> {
        if end <= start {
            return Ok(());
        }
        const Z: [u8; 4096] = [0u8; 4096];
        let mut pos = start;
        while pos < end {
            let want = (end - pos).min(Z.len() as u64) as usize;
            self.write_into_runs(pos, &Z[..want])?;
            pos += want as u64;
        }
        Ok(())
    }

    /// Internal write path. Extends the runs as needed, zeros any gap
    /// between old EOF and the cursor, writes the bytes, updates the
    /// in-memory size and marks dirty.
    fn write_inner(&mut self, buf: &[u8]) -> io::Result<usize> {
        if buf.is_empty() {
            return Ok(0);
        }
        let new_end = self.pos + buf.len() as u64;
        let gap_start = self.file_size;
        let gap_end = self.pos.min(new_end);
        self.ensure_capacity(new_end)
            .map_err(|e| io::Error::other(e.to_string()))?;
        if gap_end > gap_start {
            self.zero_range(gap_start, gap_end)?;
        }
        self.write_into_runs(self.pos, buf)?;
        self.pos += buf.len() as u64;
        if self.pos > self.file_size {
            self.file_size = self.pos;
        }
        self.dirty = true;
        Ok(buf.len())
    }

    /// Grow or shrink the file to exactly `new_len` bytes. Marks dirty.
    fn set_len_inner(&mut self, new_len: u64) -> Result<()> {
        if new_len > self.file_size {
            let old_len = self.file_size;
            self.ensure_capacity(new_len)?;
            self.file_size = new_len;
            self.zero_range(old_len, new_len)
                .map_err(crate::Error::Io)?;
        } else if new_len < self.file_size {
            self.shrink_to(new_len)?;
            self.file_size = new_len;
            if self.pos > self.file_size {
                self.pos = self.file_size;
            }
        }
        self.dirty = true;
        Ok(())
    }

    /// Re-encode the catalog file body to reflect the current run list
    /// and `file_size`. Inline extents go straight into the file
    /// record's data fork; spilled extents go into
    /// `writer.overflow_extents` keyed by `(FORK_DATA, file_id, ...)`.
    fn refresh_catalog_body(&mut self) -> Result<()> {
        // Build the new inline-fork descriptor up front so we don't
        // hold both an immutable view of `self.runs` and a mutable
        // borrow of `self.fs.writer` simultaneously.
        let mut inline = [ExtentDescriptor::default(); FORK_EXTENT_COUNT];
        let inline_count = self.runs.len().min(FORK_EXTENT_COUNT);
        for (slot, ext) in inline.iter_mut().zip(self.runs.iter().take(inline_count)) {
            *slot = *ext;
        }
        let total_blocks = self.total_blocks();
        let logical_size = self.file_size;
        let file_id = self.file_id;
        let extra_runs: Vec<ExtentDescriptor> = if self.runs.len() > FORK_EXTENT_COUNT {
            self.runs[FORK_EXTENT_COUNT..].to_vec()
        } else {
            Vec::new()
        };
        let writer =
            self.fs.writer.as_mut().ok_or_else(|| {
                crate::Error::InvalidArgument("hfs+: volume opened read-only".into())
            })?;
        let new_fork = ForkData {
            logical_size,
            clump_size: writer.block_size,
            total_blocks,
            extents: inline,
        };

        // 1. Patch the file record's data-fork bytes inside the
        //    encoded body. Data fork starts at offset 88, length
        //    FORK_DATA_SIZE (= 80).
        let body = writer.catalog.get_mut(&self.cat_key).ok_or_else(|| {
            crate::Error::InvalidImage("hfs+ handle: catalog entry vanished".into())
        })?;
        if body.len() < 88 + FORK_DATA_SIZE {
            return Err(crate::Error::InvalidImage(
                "hfs+ handle: short catalog file body".into(),
            ));
        }
        if body.len() < 2 || i16::from_be_bytes([body[0], body[1]]) != REC_FILE {
            return Err(crate::Error::InvalidImage(
                "hfs+ handle: catalog body is not a file record".into(),
            ));
        }
        let enc = encode_fork_array(&new_fork);
        body[88..88 + FORK_DATA_SIZE].copy_from_slice(&enc);

        // 2. Drop any existing overflow records for this file's data
        //    fork; we'll re-emit them from the current run list.
        let keys: Vec<(u8, u32, u32)> = writer
            .overflow_extents
            .range((FORK_DATA, file_id, 0)..=(FORK_DATA, file_id, u32::MAX))
            .map(|(k, _)| *k)
            .collect();
        for k in keys {
            writer.overflow_extents.remove(&k);
        }

        // 3. If we have more than 8 runs, lay the remainder into
        //    extents-overflow records (8 per record), keyed by the
        //    fork-block where each record starts.
        if !extra_runs.is_empty() {
            let mut start_block: u32 = inline
                .iter()
                .map(|e| e.block_count)
                .fold(0u32, |a, b| a.saturating_add(b));
            for chunk in extra_runs.chunks(FORK_EXTENT_COUNT) {
                let mut group = [ExtentDescriptor::default(); FORK_EXTENT_COUNT];
                for (slot, ext) in group.iter_mut().zip(chunk.iter()) {
                    *slot = *ext;
                }
                writer
                    .overflow_extents
                    .insert((FORK_DATA, file_id, start_block), group);
                for ext in chunk {
                    start_block = start_block.saturating_add(ext.block_count);
                }
            }
        }
        Ok(())
    }

    /// Persist this handle's changes.
    ///
    /// Two-phase commit on a journaled volume:
    ///
    ///   1. Commit the user-data journal — writes the transaction
    ///      header into the journal buffer at `end`, persists `end`,
    ///      applies the in-place writes, then advances `start = end`.
    ///      A crash anywhere in this sequence leaves a recoverable
    ///      journal state ([`super::journal::replay`] is idempotent).
    ///   2. Refresh the catalog body and run [`super::HfsPlus::flush`]
    ///      to rewrite the catalog tree, extents-overflow tree,
    ///      allocation bitmap, and volume header. NOT journaled; a
    ///      crash here leaves an orphan-allocation leak — see module
    ///      docs.
    ///
    /// On an unjournaled volume step 1 is a no-op and writes have
    /// already been applied in place by `dev_write_at`.
    fn sync_inner(&mut self) -> Result<()> {
        if !self.dirty {
            return Ok(());
        }
        // Phase 1: flush the user-data journal.
        if let Some(journal) = self.journal.as_mut() {
            journal.commit(self.dev)?;
        }
        // Phase 2: refresh metadata.
        self.refresh_catalog_body()?;
        self.fs.flush(self.dev)?;
        self.dirty = false;
        Ok(())
    }
}

impl<'a> Read for HfsPlusFileHandle<'a> {
    fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> {
        self.read_inner(buf)
    }
}

impl<'a> Write for HfsPlusFileHandle<'a> {
    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
        self.write_inner(buf)
    }

    fn flush(&mut self) -> io::Result<()> {
        self.sync_inner()
            .map_err(|e| io::Error::other(e.to_string()))
    }
}

impl<'a> Seek for HfsPlusFileHandle<'a> {
    fn seek(&mut self, pos: SeekFrom) -> io::Result<u64> {
        let new_pos: i128 = match pos {
            SeekFrom::Start(n) => n as i128,
            SeekFrom::End(d) => self.file_size as i128 + d as i128,
            SeekFrom::Current(d) => self.pos as i128 + d as i128,
        };
        if new_pos < 0 {
            return Err(io::Error::new(
                io::ErrorKind::InvalidInput,
                "hfs+: seek to negative offset",
            ));
        }
        self.pos = new_pos as u64;
        Ok(self.pos)
    }
}

impl<'a> FileHandle for HfsPlusFileHandle<'a> {
    fn len(&self) -> u64 {
        self.file_size
    }

    fn set_len(&mut self, new_len: u64) -> Result<()> {
        self.set_len_inner(new_len)
    }

    fn sync(&mut self) -> Result<()> {
        self.sync_inner()
    }
}

impl<'a> Drop for HfsPlusFileHandle<'a> {
    fn drop(&mut self) {
        // Best-effort: persist on drop so the file is durable even when
        // the caller forgets to `sync`. Drop can't return errors, so we
        // swallow them. Tests should `sync()` explicitly to surface I/O
        // failures.
        if self.dirty {
            if let Some(journal) = self.journal.as_mut() {
                let _ = journal.commit(self.dev);
            }
            let _ = self.refresh_catalog_body();
            let _ = self.fs.flush(self.dev);
            self.dirty = false;
        }
    }
}

/// Encode an `HFSPlusForkData` (80 bytes) into a byte array. Mirrors
/// the writer's `fork_to_array` helper (kept private there) — duplicated
/// here so the handle stays decoupled from writer internals.
fn encode_fork_array(fork: &ForkData) -> [u8; FORK_DATA_SIZE] {
    let mut out = [0u8; FORK_DATA_SIZE];
    out[0..8].copy_from_slice(&fork.logical_size.to_be_bytes());
    out[8..12].copy_from_slice(&fork.clump_size.to_be_bytes());
    out[12..16].copy_from_slice(&fork.total_blocks.to_be_bytes());
    for (i, ext) in fork.extents.iter().enumerate() {
        let off = 16 + i * 8;
        out[off..off + 4].copy_from_slice(&ext.start_block.to_be_bytes());
        out[off + 4..off + 8].copy_from_slice(&ext.block_count.to_be_bytes());
    }
    out
}

/// Open `path` for read+write, honoring the requested flags. On a
/// journaled volume that carries an unreplayed transaction we replay
/// it first — the caller never has to know whether the previous
/// session crashed mid-sync.
pub(super) fn open_file_rw<'a>(
    fs: &'a mut HfsPlus,
    dev: &'a mut dyn BlockDevice,
    path: &std::path::Path,
    flags: crate::fs::OpenFlags,
    meta: Option<crate::fs::FileMeta>,
) -> Result<Box<dyn FileHandle + 'a>> {
    let path_str = path
        .to_str()
        .ok_or_else(|| crate::Error::InvalidArgument(format!("hfs+: non-UTF-8 path {path:?}")))?;

    // Drain any outstanding journal transactions so we open over a
    // clean volume. On an unjournaled image this is a no-op.
    super::journal::replay(dev, &fs.volume_header)?;

    // Resolve to an existing file, optionally creating it. We can't
    // borrow `fs` through the lookup machinery while we also need a
    // mutable borrow for create, so do them in distinct phases.
    let resolved = lookup_file_for_rw(fs, path_str);
    let (parent_id, name) = split_parent_and_name(fs, path_str)?;
    let owned_key = OwnedKey {
        parent_id,
        name: name.clone(),
    };

    let resolved = match resolved {
        Ok(()) => Some(()),
        Err(_) if flags.create => None,
        Err(e) => return Err(e),
    };

    if resolved.is_none() {
        // create=true path. Insert an empty regular file via the
        // existing writer machinery.
        let meta = meta.ok_or_else(|| {
            crate::Error::InvalidArgument(
                "hfs+: open_file_rw with create=true requires meta".into(),
            )
        })?;
        let mut empty = std::io::Cursor::new(Vec::<u8>::new());
        fs.create_file(dev, path_str, &mut empty, 0, meta.mode, meta.uid, meta.gid)?;
    }

    // Read the catalog body and assemble the merged run list.
    let (file_id, file_size, runs) = {
        let writer = fs
            .writer
            .as_ref()
            .ok_or_else(|| crate::Error::InvalidArgument("hfs+: volume opened read-only".into()))?;
        let body = writer.catalog.get(&owned_key).ok_or_else(|| {
            crate::Error::InvalidArgument(format!(
                "hfs+: no entry {:?} under CNID {parent_id}",
                name.to_string_lossy()
            ))
        })?;
        if body.len() < 88 + FORK_DATA_SIZE || i16::from_be_bytes([body[0], body[1]]) != REC_FILE {
            return Err(crate::Error::InvalidArgument(format!(
                "hfs+: {path_str} is not a regular file"
            )));
        }
        // Verify the file is a plain regular (not hlnk, not slnk).
        let file_type = &body[48..52];
        let creator = &body[52..56];
        if file_type == b"hlnk" && creator == b"hfs+" {
            return Err(crate::Error::Unsupported(format!(
                "hfs+: {path_str} is a hard link; open_file_rw on the iNode is not implemented"
            )));
        }
        if file_type == b"slnk" && creator == b"rhap" {
            return Err(crate::Error::InvalidArgument(format!(
                "hfs+: {path_str} is a symlink, not a regular file"
            )));
        }
        // mode_bits: file_mode lives inside BSDInfo at body[32..48], with
        // file_mode at byte 42..44.
        let file_mode = u16::from_be_bytes([body[42], body[43]]);
        let mode_bits = file_mode & mode::S_IFMT;
        if mode_bits != 0 && mode_bits != mode::S_IFREG {
            return Err(crate::Error::Unsupported(format!(
                "hfs+: {path_str} is not a regular file (mode {file_mode:#06o})"
            )));
        }
        let file_id = u32::from_be_bytes(body[8..12].try_into().unwrap());

        let mut fork_buf = [0u8; FORK_DATA_SIZE];
        fork_buf.copy_from_slice(&body[88..88 + FORK_DATA_SIZE]);
        let fork = ForkData::decode(&fork_buf);

        // Merged run list: inline extents first, then overflow groups
        // in fork-block order.
        let mut runs: Vec<ExtentDescriptor> = Vec::new();
        for ext in &fork.extents {
            if ext.block_count == 0 {
                continue;
            }
            runs.push(*ext);
        }
        for ((fork_type, fid, _start), group) in writer
            .overflow_extents
            .range((FORK_DATA, file_id, 0)..=(FORK_DATA, file_id, u32::MAX))
        {
            debug_assert_eq!((*fork_type, *fid), (FORK_DATA, file_id));
            for ext in group {
                if ext.block_count == 0 {
                    continue;
                }
                runs.push(*ext);
            }
        }

        (file_id, fork.logical_size, runs)
    };

    // Load a fresh JournalLog (if applicable) so the handle can buffer
    // user-data writes through the journal. Loading happens AFTER the
    // replay above, so `start == end` is the only state we accept here.
    let journal = super::journal::JournalLog::load(dev, &fs.volume_header)?;

    let mut handle = HfsPlusFileHandle::new(fs, dev, owned_key, file_id, runs, file_size, journal);
    if flags.truncate && handle.file_size > 0 {
        handle.set_len_inner(0)?;
    }
    if flags.append {
        handle.pos = handle.file_size;
    }
    Ok(Box::new(handle))
}

/// Probe the writer's in-memory catalog for a regular file at
/// `path_str`. Returns Ok only when the entry exists.
fn lookup_file_for_rw(fs: &HfsPlus, path_str: &str) -> Result<()> {
    let (parent_id, name) = split_parent_and_name(fs, path_str)?;
    let writer = fs
        .writer
        .as_ref()
        .ok_or_else(|| crate::Error::InvalidArgument("hfs+: volume opened read-only".into()))?;
    let key = OwnedKey {
        parent_id,
        name: name.clone(),
    };
    if writer.catalog.contains_key(&key) {
        Ok(())
    } else {
        Err(crate::Error::InvalidArgument(format!(
            "hfs+: no entry {:?} under CNID {parent_id}",
            name.to_string_lossy()
        )))
    }
}

/// Walk `path_str` and return the parent CNID + final-name component,
/// resolving every intermediate against the writer's in-memory catalog.
fn split_parent_and_name(fs: &HfsPlus, path_str: &str) -> Result<(u32, UniStr)> {
    let parts: Vec<&str> = path_str
        .split('/')
        .filter(|p| !p.is_empty() && *p != ".")
        .collect();
    if parts.is_empty() {
        return Err(crate::Error::InvalidArgument(
            "hfs+: cannot open the root path".into(),
        ));
    }
    let (last, prefix) = parts.split_last().unwrap();
    let writer = fs
        .writer
        .as_ref()
        .ok_or_else(|| crate::Error::InvalidArgument("hfs+: volume opened read-only".into()))?;
    let mut cnid = super::catalog::ROOT_FOLDER_ID;
    for part in prefix {
        let name = UniStr::from_str_lossy(part);
        let (_, child_cnid, rec_type) = writer.lookup(cnid, &name).ok_or_else(|| {
            crate::Error::InvalidArgument(format!("hfs+: parent component {part:?} does not exist"))
        })?;
        if rec_type != super::catalog::REC_FOLDER {
            return Err(crate::Error::InvalidArgument(format!(
                "hfs+: component {part:?} is not a directory"
            )));
        }
        cnid = child_cnid;
    }
    Ok((cnid, UniStr::from_str_lossy(last)))
}