Skip to content
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.

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

Bump libc & remove unnecessary unsafe blocks #7434

Merged
merged 2 commits into from
Mar 12, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Cargo.lock

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

36 changes: 18 additions & 18 deletions fuzz/Cargo.lock

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

4 changes: 2 additions & 2 deletions src/uu/ls/src/ls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3179,8 +3179,8 @@ fn display_len_or_rdev(metadata: &Metadata, config: &Config) -> SizeOrDeviceId {
if ft.is_char_device() || ft.is_block_device() {
// A type cast is needed here as the `dev_t` type varies across OSes.
let dev = metadata.rdev() as dev_t;
let major = unsafe { major(dev) };
let minor = unsafe { minor(dev) };
let major = major(dev);
let minor = minor(dev);
return SizeOrDeviceId::Device(major.to_string(), minor.to_string());
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/uu/wc/src/count_fast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fn count_bytes_using_splice(fd: &impl AsFd) -> Result<usize, usize> {
let null_rdev = stat::fstat(null_file.as_raw_fd())
.map_err(|_| 0_usize)?
.st_rdev as libc::dev_t;
if unsafe { (libc::major(null_rdev), libc::minor(null_rdev)) } != (1, 3) {
if (libc::major(null_rdev), libc::minor(null_rdev)) != (1, 3) {
// This is not a proper /dev/null, writing to it is probably bad
// Bit of an edge case, but it has been known to happen
return Err(0);
Expand Down
2 changes: 1 addition & 1 deletion tests/by-util/test_ls.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4407,7 +4407,7 @@ fn test_device_number() {
let blk_dev_path = blk_dev.path();
let blk_dev_meta = metadata(blk_dev_path.as_path()).unwrap();
let blk_dev_number = blk_dev_meta.rdev() as dev_t;
let (major, minor) = unsafe { (major(blk_dev_number), minor(blk_dev_number)) };
let (major, minor) = (major(blk_dev_number), minor(blk_dev_number));
let major_minor_str = format!("{major}, {minor}");

let scene = TestScenario::new(util_name!());
Expand Down
Loading