Skip to content

dir/gen3: factor out helper to obtain directory name #142

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orangecms merged 1 commit into from
Nov 15, 2025
Merged

dir/gen3: factor out helper to obtain directory name #142

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/dir/gen3.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,17 @@ pub struct CPDHeader {
// _10: u32,
}

impl CPDHeader {
pub fn name(&self) -> String {
let n = self.part_name;
match std::str::from_utf8(&n) {
// some names are shorter than 4 bytes and padded with 0x0
Ok(n) => n.trim_end_matches('\0').to_string(),
Err(_) => format!("{:02x?}", n),
}
}
}

const HEADER_SIZE: usize = core::mem::size_of::<CPDHeader>();

// See <https://github.com/corna/me_cleaner> `check_and_remove_modules_gen3()`
Expand Down Expand Up @@ -141,12 +152,7 @@ impl CodePartitionDirectory {
let Ok((header, _)) = CPDHeader::read_from_prefix(&data) else {
return Err("could not parse CPD header".to_string());
};
let n = header.part_name;
let name = match std::str::from_utf8(&n) {
// some names are shorter than 4 bytes and padded with 0x0
Ok(n) => n.trim_end_matches('\0').to_string(),
Err(_) => format!("{:02x?}", n),
};
let name = header.name();
let header_size = if header.version_or_checksum == 0x00140102 {
HEADER_SIZE + 4
} else {
Expand Down