TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-12 00:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make all Utf8CStrWrite Utf8CStrBuf

Browse Source
This commit is contained in:
topjohnwu
2025-02-15 10:56:59 -08:00
committed by John Wu
parent 3c7c46307a
commit 584f3820fe
4 changed files with 94 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
native/src/base/files.rs
View File

@@ -1,7 +1,6 @@
use crate::cxx_extern::readlinkat_for_cxx;
use crate::{
cstr, errno, error, FsPath, FsPathBuf, LibcReturn, Utf8CStr, Utf8CStrBuf, Utf8CStrBufArr,
Utf8CStrWrite,
};
use bytemuck::{bytes_of, bytes_of_mut, Pod};
use libc::{
@@ -622,9 +621,9 @@ impl FsPath {
buf.clear();
unsafe {
let r = libc::readlink(self.as_ptr(), buf.as_mut_ptr().cast(), buf.capacity() - 1)
.check_os_err()? as usize;
*buf.mut_buf().get_unchecked_mut(r) = b'\0';
buf.set_len(r);
.check_os_err()? as isize;
*(buf.as_mut_ptr().offset(r) as *mut u8) = b'\0';
buf.set_len(r as usize);
}
Ok(())
}
@@ -791,7 +790,7 @@ impl FsPath {
unsafe { libc::symlink(self.as_ptr(), path.as_ptr()).as_os_err() }
}
pub fn parent(&self, buf: &mut dyn Utf8CStrWrite) -> bool {
pub fn parent(&self, buf: &mut dyn Utf8CStrBuf) -> bool {
buf.clear();
if let Some(parent) = Path::new(self.as_str()).parent() {
let bytes = parent.as_os_str().as_bytes();