RGBCube/uutils-coreutils
1
Fork 0
mirror of https://github.com/RGBCube/uutils-coreutils synced 2025-07-29 12:07:46 +00:00
Code Issues Activity

Merge pull request #7434 from cakebaker/bump_libc

Browse source 
Bump `libc` & remove unnecessary `unsafe` blocks
This commit is contained in:
Sylvestre Ledru 2025-03-12 09:57:25 +01:00 • committed by GitHub
commit ba247e6765
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -1278,9 +1278,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.170" version = "0.2.171"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
[[package]] [[package]]
name = "libloading" name = "libloading"

36
fuzz/Cargo.lock generated
View file

@ -610,9 +610,9 @@ dependencies = [
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.170" version = "0.2.171"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
[[package]] [[package]]
name = "libfuzzer-sys" name = "libfuzzer-sys"
@ -1188,7 +1188,7 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
[[package]] [[package]]
name = "uu_cksum" name = "uu_cksum"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"clap", "clap",
"hex", "hex",
@ -1198,7 +1198,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_cut" name = "uu_cut"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"bstr", "bstr",
"clap", "clap",
@ -1208,7 +1208,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_date" name = "uu_date"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"chrono", "chrono",
"clap", "clap",
@ -1220,7 +1220,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_echo" name = "uu_echo"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"clap", "clap",
"uucore", "uucore",
@ -1228,7 +1228,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_env" name = "uu_env"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"clap", "clap",
"nix", "nix",
@ -1238,7 +1238,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_expr" name = "uu_expr"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"clap", "clap",
"num-bigint", "num-bigint",
@ -1250,7 +1250,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_printf" name = "uu_printf"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"clap", "clap",
"uucore", "uucore",
@ -1258,7 +1258,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_seq" name = "uu_seq"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"bigdecimal", "bigdecimal",
"clap", "clap",
@ -1270,7 +1270,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_sort" name = "uu_sort"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"binary-heap-plus", "binary-heap-plus",
"clap", "clap",
@ -1291,7 +1291,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_split" name = "uu_split"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"clap", "clap",
"memchr", "memchr",
@ -1300,7 +1300,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_test" name = "uu_test"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"clap", "clap",
"libc", "libc",
@ -1309,7 +1309,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_tr" name = "uu_tr"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"clap", "clap",
"nom", "nom",
@ -1318,7 +1318,7 @@ dependencies = [
[[package]] [[package]]
name = "uu_wc" name = "uu_wc"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"bytecount", "bytecount",
"clap", "clap",
@ -1331,7 +1331,7 @@ dependencies = [
[[package]] [[package]]
name = "uucore" name = "uucore"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"blake2b_simd", "blake2b_simd",
"blake3", "blake3",
@ -1394,7 +1394,7 @@ dependencies = [
[[package]] [[package]]
name = "uucore_procs" name = "uucore_procs"
version = "0.0.29" version = "0.0.30"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -1403,7 +1403,7 @@ dependencies = [
[[package]] [[package]]
name = "uuhelp_parser" name = "uuhelp_parser"
version = "0.0.29" version = "0.0.30"
[[package]] [[package]]
name = "version_check" name = "version_check"

4
src/uu/ls/src/ls.rs
View file

@ -3179,8 +3179,8 @@ fn display_len_or_rdev(metadata: &Metadata, config: &Config) -> SizeOrDeviceId {
if ft.is_char_device() || ft.is_block_device() { if ft.is_char_device() || ft.is_block_device() {
// A type cast is needed here as the `dev_t` type varies across OSes. // A type cast is needed here as the `dev_t` type varies across OSes.
let dev = metadata.rdev() as dev_t; let dev = metadata.rdev() as dev_t;
let major = unsafe { major(dev) }; let major = major(dev);
let minor = unsafe { minor(dev) }; let minor = minor(dev);
return SizeOrDeviceId::Device(major.to_string(), minor.to_string()); return SizeOrDeviceId::Device(major.to_string(), minor.to_string());
} }
} }

2
src/uu/wc/src/count_fast.rs
View file

@ -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()) let null_rdev = stat::fstat(null_file.as_raw_fd())
.map_err(|_| 0_usize)? .map_err(|_| 0_usize)?
.st_rdev as libc::dev_t; .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 // 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 // Bit of an edge case, but it has been known to happen
return Err(0); return Err(0);

2
tests/by-util/test_ls.rs
View file

@ -4407,7 +4407,7 @@ fn test_device_number() {
let blk_dev_path = blk_dev.path(); let blk_dev_path = blk_dev.path();
let blk_dev_meta = metadata(blk_dev_path.as_path()).unwrap(); let blk_dev_meta = metadata(blk_dev_path.as_path()).unwrap();
let blk_dev_number = blk_dev_meta.rdev() as dev_t; 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 major_minor_str = format!("{major}, {minor}");
let scene = TestScenario::new(util_name!()); let scene = TestScenario::new(util_name!());