br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Cleanup dir implementations

Browse Source
This commit is contained in:
topjohnwu
2025-04-24 15:48:11 -07:00
committed by John Wu
parent f44d044095
commit 0c70b7670c
3 changed files with 123 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/src/core/package.rs
+4 -2
View File
@@ -160,7 +160,7 @@ fn find_apk_path(pkg: &str, buf: &mut dyn Utf8CStrBuf) -> LoggedResult<()> {
let name_bytes = e.name().as_bytes();
if name_bytes.starts_with(pkg.as_bytes()) && name_bytes[pkg.len()] == b'-' {
// Found the APK path, we can abort now
e.path(buf)?;
e.resolve_path(buf)?;
return Ok(Abort);
}
if name_bytes.starts_with(b"~~") {
@@ -515,7 +515,9 @@ impl MagiskD {
match user_dir.read()? {
None => break,
Some(e) => {
let attr = e.get_attr()?;
let mut entry_path = cstr::buf::default();
e.resolve_path(&mut entry_path)?;
let attr = entry_path.get_attr()?;
let app_id = to_app_id(attr.st.st_uid as i32);
if (AID_APP_START..=AID_APP_END).contains(&app_id) {
let app_no = app_id - AID_APP_START;
native/src/core/zygisk/daemon.rs
+1 -1
View File
@@ -191,7 +191,7 @@ impl MagiskD {
.join_path("zygisk");
// Create the unloaded marker file
if let Ok(dir) = Directory::open(&path) {
dir.openat_as_file(cstr!("unloaded"), O_CREAT | O_RDONLY, 0o644)
dir.open_as_file_at(cstr!("unloaded"), O_CREAT | O_RDONLY, 0o644)
.log()
.ok();
}