From 524a8c2ce49fe53e666517929921accf402035d7 Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Wed, 12 Mar 2025 09:30:25 +0100
Subject: [PATCH 1/2] Bump libc from 0.2.170 to 0.2.171
---
Cargo.lock | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 597007f..d7d32f5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -382,9 +382,9 @@ dependencies = [
[[package]]
name = "libc"
-version = "0.2.170"
+version = "0.2.171"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828"
+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
[[package]]
name = "linux-raw-sys"
From 4540ea792f72bf829aa1a760592832f3ff721194 Mon Sep 17 00:00:00 2001
From: Daniel Hofstetter <daniel.hofstetter@42dh.com>
Date: Wed, 12 Mar 2025 09:31:55 +0100
Subject: [PATCH 2/2] blockdev: remove unnecessary unsafe blocks
---
src/uu/blockdev/src/blockdev.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/uu/blockdev/src/blockdev.rs b/src/uu/blockdev/src/blockdev.rs
index aabff89..7d0e95a 100644
--- a/src/uu/blockdev/src/blockdev.rs
+++ b/src/uu/blockdev/src/blockdev.rs
@@ -230,8 +230,8 @@ mod linux {
fn get_partition_offset(device_file: &File) -> UResult<usize> {
let rdev = device_file.metadata()?.rdev();
- let major = unsafe { libc::major(rdev) };
- let minor = unsafe { libc::minor(rdev) };
+ let major = libc::major(rdev);
+ let minor = libc::minor(rdev);
if Path::new(&format!("/sys/dev/block/{}:{}/partition", major, minor)).exists() {
let mut start_fd = File::open(format!("/sys/dev/block/{}:{}/start", major, minor))?;
let mut str = String::new();