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

Create Utf8CStrBuffer type

Browse Source
This commit is contained in:
topjohnwu
2025-04-14 18:20:31 -07:00
committed by John Wu
parent 55b036c071
commit 084d89fcce
6 changed files with 105 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
native/src/base/dir.rs
View File

@@ -1,7 +1,7 @@
use crate::cxx_extern::readlinkat;
use crate::{
FileAttr, FsPath, LibcReturn, OsError, OsResult, OsResultStatic, Utf8CStr, Utf8CStrBuf, cstr,
cstr_buf, errno, fd_path, fd_set_attr,
FileAttr, FsPath, FsPathBuf, LibcReturn, OsError, OsResult, OsResultStatic, Utf8CStr,
Utf8CStrBuf, cstr, cstr_buf, errno, fd_path, fd_set_attr,
};
use libc::{EEXIST, O_CLOEXEC, O_CREAT, O_RDONLY, O_TRUNC, O_WRONLY, dirent, mode_t};
use std::ffi::CStr;
@@ -39,8 +39,12 @@ impl DirEntry<'_> {
pub fn path(&self, buf: &mut dyn Utf8CStrBuf) -> OsResult<'static, ()> {
self.dir.path(buf)?;
buf.push_str("/");
buf.push_lossy(self.name().to_bytes());
if let Ok(s) = self.name().to_str() {
FsPathBuf::from(buf).join(s);
} else {
buf.push_str("/");
buf.push_lossy(self.name().to_bytes());
}
Ok(())
}