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

Remove readlink_unsafe

Browse Source
This commit is contained in:
topjohnwu
2023-09-19 00:06:21 -07:00
parent 927cd571f8
commit 8e1a91509c
2 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/src/base/xwrap.rs
+10 -5
View File
@@ -10,7 +10,7 @@ use libc::{
ssize_t, SYS_dup3,
};
use crate::{cstr, errno, raw_cstr, readlink_unsafe, FsPath, ResultExt, Utf8CStr, Utf8CStrSlice};
use crate::{cstr, errno, raw_cstr, FsPath, ResultExt, Utf8CStr, Utf8CStrSlice};
fn ptr_to_str<'a, T>(ptr: *const T) -> &'a str {
if ptr.is_null() {
@@ -77,11 +77,16 @@ unsafe extern "C" fn xrealpath(path: *const c_char, buf: *mut u8, bufsz: usize)
#[no_mangle]
unsafe extern "C" fn xreadlink(path: *const c_char, buf: *mut u8, bufsz: usize) -> isize {
let r = readlink_unsafe(path, buf, bufsz);
if r < 0 {
perror!("readlink");
match Utf8CStr::from_ptr(path) {
Ok(p) => {
let mut buf = Utf8CStrSlice::from_ptr(buf, bufsz);
FsPath::from(p)
.read_link(&mut buf)
.log_cxx_with_msg(|w| w.write_fmt(format_args!("readlink {} failed", p)))
.map_or(-1, |_| buf.len() as isize)
}
Err(_) => -1,
}
r
}
#[no_mangle]