Skip to content

cmp: remove unsafe & don't open unnecessary /dev/null #248

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
oech3 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cmp: remove unsafe & don't open unnecessary /dev/null #248

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ chrono = "0.4.38"
diff = "0.1.13"
itoa = "1.0.11"
regex = "1.10.4"
rustix = { version = "1.1.4", features = ["fs"] }
same-file = "1.0.6"
unicode-width = "0.2.0"

Expand Down
36 changes: 36 additions & 0 deletions fuzz/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 4 additions & 22 deletions src/cmp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,6 @@ use std::iter::Peekable;
use std::process::ExitCode;
use std::{cmp, fs, io};

#[cfg(unix)]
use std::os::fd::{AsRawFd, FromRawFd};

#[cfg(unix)]
use std::os::unix::fs::MetadataExt;

#[cfg(target_os = "windows")]
use std::os::windows::fs::MetadataExt;

Expand Down Expand Up @@ -45,24 +39,12 @@ fn usage_string(executable: &str) -> String {

#[cfg(unix)]
fn is_stdout_dev_null() -> bool {
let Ok(dev_null) = fs::metadata("/dev/null") else {
let stdout = io::stdout();
let Ok(stat) = rustix::fs::fstat(stdout) else {
return false;
};

let stdout_fd = io::stdout().lock().as_raw_fd();

// SAFETY: we have exclusive access to stdout right now.
let stdout_file = unsafe { fs::File::from_raw_fd(stdout_fd) };
let Ok(stdout) = stdout_file.metadata() else {
return false;
};

let is_dev_null = stdout.dev() == dev_null.dev() && stdout.ino() == dev_null.ino();

// Don't let File close the fd. It's unfortunate that File doesn't have a leak_fd().
std::mem::forget(stdout_file);

is_dev_null
let dev = stat.st_rdev;
rustix::fs::major(dev) == 1 && rustix::fs::minor(dev) == 3
}

#[cfg(not(any(unix, target_os = "windows")))]
Expand Down
Loading