wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-12-22 21:01:36 +03:00
Code Issues Projects Releases Wiki Activity

Rearranged order of trimming and parsing

Browse Source
This commit is contained in:
Mikayla Maki 2022-09-06 19:21:56 -07:00 committed by Wez Furlong
parent d74cb1b625
commit 32771eecc6
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
procinfo/src/macos.rs
View File

@ -218,14 +218,19 @@ fn parse_exe_and_argv_sysctl(buf: Vec<u8>) -> Option<(PathBuf, Vec<String>)> {
ptr = &ptr[std::mem::size_of::<c_int>()..]; ptr = &ptr[std::mem::size_of::<c_int>()..];
fn consume_cstr(ptr: &mut &[u8]) -> Option<String> { fn consume_cstr(ptr: &mut &[u8]) -> Option<String> {
// Trim out trailing nulls // Parse to the end of a null terminated string
let not_nul = ptr.iter().position(|&c| c != 0)?;
*ptr = ptr.get(not_nul..)?;
// Then parse to the end of the null terminated string
let nul = ptr.iter().position(|&c| c == 0)?; let nul = ptr.iter().position(|&c| c == 0)?;
let s = String::from_utf8_lossy(&ptr[0..nul]).to_owned().to_string(); let s = String::from_utf8_lossy(&ptr[0..nul]).to_owned().to_string();
*ptr = ptr.get(nul + 1..)?; *ptr = ptr.get(nul + 1..)?;
// Find the position of the first non null byte. `.position()`
// will return None if we run off the end.
if let Some(not_nul) = ptr.iter().position(|&c| c != 0) {
// If there are no trailing nulls, not_nul will be 0
// and this call will be a noop
*ptr = ptr.get(not_nul..)?;
}
Some(s) Some(s)
} }