Skip to content

Add mmap fallback #40

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add mmap fallback #40

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
14 changes: 10 additions & 4 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ use clap::{
crate_authors, crate_description, crate_version, Arg, ArgAction, ArgGroup,
Command,
};
#[cfg(all(feature = "maps", target_os = "linux"))]
use either::Either;
use goblin::error::Error;
#[cfg(feature = "macho")]
Expand All @@ -33,7 +32,7 @@ use std::collections::HashMap;
#[cfg(all(target_os = "linux", feature = "elf"))]
use std::collections::HashSet;
use std::ffi::OsStr;
use std::io::ErrorKind;
use std::io::{ErrorKind, Read};
#[cfg(all(feature = "color", not(target_os = "windows")))]
use std::os::unix::fs::PermissionsExt;
use std::path::Path;
Expand Down Expand Up @@ -321,8 +320,15 @@ fn parse(
}
}

let fp = fs::File::open(file)?;
let buffer = unsafe { Mmap::map(&fp)? };
let mut fp = fs::File::open(file)?;
let buffer = if let Ok(buf) = unsafe { Mmap::map(&fp) } {
Either::Left(buf)
} else {
let size = fp.metadata().map(|m| m.len()).unwrap_or(0);
let mut buf = Vec::with_capacity(usize::try_from(size).unwrap());
fp.read_to_end(&mut buf)?;
Either::Right(buf)
};

let result = parse_bytes(&buffer, file)?;
if let Some(ref mut cache) = cache {
Expand Down