android/SukiSU-Ultra
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore(ksud): enable clippy::all, clippy::pedantic && make clippy happy (#617)

Browse Source 
* Revert "chore(ksud): bump ksud's deps (#585)"
* Because it may cause compilation errors.

This reverts commit c8020b2066.

* chore(ksud): remove unused Result

Signed-off-by: Tools-app <localhost.hutao@gmail.com>

* chore(ksud): enable clippy::all, clippy::pedantic && make clippy happy

https://rust-lang.github.io/rust-clippy/master/index.html#map_unwrap_or

https://rust-lang.github.io/rust-clippy/master/index.html#uninlined_format_args

https://rust-lang.github.io/rust-clippy/master/index.html#used_underscore_items

https://rust-lang.github.io/rust-clippy/master/index.html#redundant_closure_for_method_calls

https://rust-lang.github.io/rust-clippy/master/index.html#redundant_pub_crate
...
and use some #![allow(...)] or #[allow(...)]

Signed-off-by: Tools-app <localhost.hutao@gmail.com>

---------

Signed-off-by: Tools-app <localhost.hutao@gmail.com>
This commit is contained in:
生于生时 亡于亡刻
2025-11-22 06:09:45 +08:00
committed by ShirkNeko
parent 6898d82daf
commit 27f6db889a
20 changed files with 829 additions and 784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
userspace/ksud/src/umount_manager.rs
View File

@@ -8,6 +8,7 @@ use crate::ksucalls::ksuctl;
const MAGIC_NUMBER_HEADER: &[u8; 4] = b"KUMT";
const MAGIC_VERSION: u32 = 1;
const CONFIG_FILE: &str = "/data/adb/ksu/.umount";
#[allow(clippy::unreadable_literal)]
const KSU_IOCTL_UMOUNT_MANAGER: u32 = 0xc0004b6b; // _IOC(_IOC_READ|_IOC_WRITE, 'K', 107, 0)
#[derive(Clone, Serialize, Deserialize, Debug)]
@@ -39,7 +40,7 @@ struct UmountManagerCmd {
impl Default for UmountManagerCmd {
fn default() -> Self {
UmountManagerCmd {
Self {
operation: 0,
path: [0; 256],
flags: 0,
@@ -61,7 +62,7 @@ impl UmountManager {
}
};
Ok(UmountManager {
Ok(Self {
config,
config_path: path,
})
@@ -81,7 +82,7 @@ impl UmountManager {
let version = u32::from_le_bytes([data[4], data[5], data[6], data[7]]);
if version != MAGIC_VERSION {
return Err(anyhow!("Unsupported config version: {}", version));
return Err(anyhow!("Unsupported config version: {version}"));
}
let json_data = &data[8..];
@@ -110,7 +111,7 @@ impl UmountManager {
pub fn add_entry(&mut self, path: &str, flags: i32) -> Result<()> {
let exists = self.config.entries.iter().any(|e| e.path == path);
if exists {
return Err(anyhow!("Entry already exists: {}", path));
return Err(anyhow!("Entry already exists: {path}"));
}
let entry = UmountEntry {
@@ -128,7 +129,7 @@ impl UmountManager {
self.config.entries.retain(|e| e.path != path);
if before == self.config.entries.len() {
return Err(anyhow!("Entry not found: {}", path));
return Err(anyhow!("Entry not found: {path}"));
}
Ok(())
}
@@ -137,9 +138,8 @@ impl UmountManager {
self.config.entries.clone()
}
pub fn clear_custom_entries(&mut self) -> Result<()> {
pub fn clear_custom_entries(&mut self) {
self.config.entries.retain(|e| e.is_default);
Ok(())
}
pub fn apply_to_kernel(&self) -> Result<()> {
@@ -183,7 +183,7 @@ pub fn add_umount_path(path: &str, flags: i32) -> Result<()> {
let mut manager = init_umount_manager()?;
manager.add_entry(path, flags)?;
manager.save_config()?;
println!("✓ Added umount path: {}", path);
println!("✓ Added umount path: {path}");
Ok(())
}
@@ -191,7 +191,7 @@ pub fn remove_umount_path(path: &str) -> Result<()> {
let mut manager = init_umount_manager()?;
manager.remove_entry(path)?;
manager.save_config()?;
println!("✓ Removed umount path: {}", path);
println!("✓ Removed umount path: {path}");
Ok(())
}
@@ -222,7 +222,7 @@ pub fn list_umount_paths() -> Result<()> {
#[cfg(any(target_os = "linux", target_os = "android"))]
fn umount_manager_ioctl(cmd: &UmountManagerCmd) -> std::io::Result<()> {
let mut ioctl_cmd = *cmd;
ksuctl(KSU_IOCTL_UMOUNT_MANAGER, &mut ioctl_cmd as *mut _)?;
ksuctl(KSU_IOCTL_UMOUNT_MANAGER, &raw mut ioctl_cmd)?;
Ok(())
}
@@ -233,7 +233,7 @@ pub fn umount_manager_ioctl(_cmd: &UmountManagerCmd) -> std::io::Result<()> {
pub fn clear_custom_paths() -> Result<()> {
let mut manager = init_umount_manager()?;
manager.clear_custom_entries()?;
manager.clear_custom_entries();
manager.save_config()?;
println!("✓ Cleared all custom paths");
Ok(())
@@ -242,7 +242,7 @@ pub fn clear_custom_paths() -> Result<()> {
pub fn save_umount_config() -> Result<()> {
let manager = init_umount_manager()?;
manager.save_config()?;
println!("✓ Configuration saved to: {}", CONFIG_FILE);
println!("✓ Configuration saved to: {CONFIG_FILE}");
Ok(())
}