Remove FsPath and FsPathMnt trait

Directly use Utf8CStr

native/src/init/getinfo.rs

@@ -1,5 +1,5 @@
 use crate::ffi::{BootConfig, MagiskInit, backup_init};
-use base::{BytesExt, FsPath, MappedFile, cstr};
+use base::{BytesExt, MappedFile, cstr};
 
 impl BootConfig {
     #[allow(unused_imports, unused_unsafe)]

native/src/init/init.rs

@@ -6,7 +6,7 @@ use crate::{
     logging::setup_klog,
 };
 use base::{
-    FsPath, FsPathMnt, LibcReturn, LoggedResult, ResultExt, cstr, info,
+    LibcReturn, LoggedResult, ResultExt, cstr, info,
     libc::{basename, getpid, mount, umask},
     raw_cstr,
 };

native/src/init/logging.rs

@@ -1,5 +1,5 @@
 use base::{
-    FsPath, LOGGER, LogLevel, Logger, SilentResultExt, Utf8CStr, cstr,
+    LOGGER, LogLevel, Logger, SilentResultExt, Utf8CStr, cstr,
     libc::{
         O_CLOEXEC, O_RDWR, O_WRONLY, S_IFCHR, STDERR_FILENO, STDIN_FILENO, STDOUT_FILENO, SYS_dup3,
         makedev, mknod, syscall,

native/src/init/mount.rs

@@ -1,8 +1,7 @@
 use crate::ffi::MagiskInit;
 use base::libc::{TMPFS_MAGIC, statfs};
 use base::{
-    Directory, FsPath, FsPathBuilder, FsPathMnt, LibcReturn, LoggedResult, ResultExt, Utf8CStr,
-    cstr, debug, libc,
+    Directory, FsPathBuilder, LibcReturn, LoggedResult, ResultExt, Utf8CStr, cstr, debug, libc,
     libc::{chdir, chroot, execve, exit, mount},
     parse_mount_info, raw_cstr,
 };

native/src/init/rootdir.rs

@@ -2,8 +2,8 @@ use crate::consts::{ROOTMNT, ROOTOVL};
 use crate::ffi::MagiskInit;
 use base::libc::{O_CREAT, O_RDONLY, O_WRONLY};
 use base::{
-    BufReadExt, Directory, FsPath, FsPathBuilder, FsPathMnt, LoggedResult, ResultExt, Utf8CStr,
-    Utf8CString, clone_attr, cstr, debug,
+    BufReadExt, Directory, FsPathBuilder, LoggedResult, ResultExt, Utf8CStr, Utf8CString,
+    clone_attr, cstr, debug,
 };
 use std::io::BufReader;
 use std::{

native/src/init/selinux.rs

@@ -2,8 +2,8 @@ use crate::consts::{PREINITMIRR, SELINUXMOCK};
 use crate::ffi::{MagiskInit, preload_ack, preload_lib, preload_policy, split_plat_cil};
 use base::const_format::concatcp;
 use base::{
-    BytesExt, FsPath, FsPathMnt, LibcReturn, LoggedResult, MappedFile, ResultExt, Utf8CStr, cstr,
-    debug, error, info, libc, raw_cstr,
+    BytesExt, LibcReturn, LoggedResult, MappedFile, ResultExt, Utf8CStr, cstr, debug, error, info,
+    libc, raw_cstr,
 };
 use magiskpolicy::ffi::SePolicy;
 use std::io::{Read, Write};

native/src/init/twostage.rs

@@ -1,6 +1,6 @@
 use crate::ffi::MagiskInit;
 use base::{
-    FsPath, FsPathMnt, LoggedResult, MappedFile, MutBytesExt, ResultExt, cstr, debug, error,
+    LoggedResult, MappedFile, MutBytesExt, ResultExt, cstr, debug, error,
     libc::{O_CLOEXEC, O_CREAT, O_RDONLY, O_WRONLY},
 };
 use std::io::Write;