Update rootdir.rs

Author: Howard20181

native/src/init/rootdir.rs

@@ -2,8 +2,8 @@ use crate::consts::{PREINITMIRR, ROOTMNT, ROOTOVL};
 use crate::ffi::MagiskInit;
 use base::libc::{O_CLOEXEC, O_CREAT, O_RDONLY, O_WRONLY};
 use base::{
-    BufReadExt, Directory, FsPath, FsPathBuilder, FsPathMnt, LoggedResult, ResultExt, Utf8CStr, Utf8CString,
-    clone_attr, const_format::concatcp, cstr, debug,
+    BufReadExt, Directory, FsPath, FsPathBuilder, FsPathMnt, LoggedResult, ResultExt, Utf8CStr,
+    Utf8CString, clone_attr, const_format::concatcp, cstr, debug,
 };
 use std::io::BufReader;
 use std::{
@@ -73,9 +73,9 @@ impl MagiskInit {
 
     pub(crate) fn load_overlay_rc(&mut self, overlay: &Utf8CStr, module_path: &Utf8CStr) {
         if let Ok(mut dir) = Directory::open(overlay) {
-            let init_rc = FsPathBuf::from(cstr::buf::dynamic(256))
-                .join(overlay)
-                .join("init.rc");
+            let init_rc = cstr::buf::dynamic(256)
+                .join_path(overlay)
+                .join_path("init.rc");
             if init_rc.exists() {
                 // Do not allow overwrite init.rc
                 init_rc.remove().log_ok();
@@ -84,26 +84,23 @@ impl MagiskInit {
                 match dir.read() {
                     Ok(None) => break,
                     Ok(Some(e)) => {
-                        let recursive = FsPathBuf::from(cstr::buf::dynamic(256))
-                            .join(module_path)
-                            .exists();
+                        let recursive = cstr::buf::dynamic(256).join_path(module_path).exists();
                         if (recursive && e.is_dir()) || e.is_file() {
                             let buf = &mut cstr::buf::dynamic(256);
                             e.path(buf).log_ok();
                             if e.is_file() && buf.ends_with(".rc") {
                                 let mut path;
                                 if recursive {
-                                    path = FsPathBuf::from(cstr::buf::dynamic(256))
-                                        .join(buf.replace(module_path.as_str(), ""));
+                                    path = cstr::buf::dynamic(256)
+                                        .join_path(buf.replace(module_path.as_str(), ""));
                                 } else {
-                                    path = FsPathBuf::from(cstr::buf::dynamic(256))
-                                        .join("/")
-                                        .join(e.name());
+                                    path =
+                                        cstr::buf::dynamic(256).join_path("/").join_path(e.name());
                                 }
                                 if path.exists() {
                                     debug!("Replace rc script [{}] -> [{}]", path, buf);
                                 } else {
-                                    path = FsPathBuf::from(cstr::buf::dynamic(256)).join(buf);
+                                    path = cstr::buf::dynamic(256).join_path(buf);
                                     debug!("Found rc script [{}]", path);
                                     let mut rc_content = String::new();
                                     if let Ok(mut file) = path.open(O_RDONLY | O_CLOEXEC) {
@@ -134,9 +131,9 @@ impl MagiskInit {
                     Ok(Some(e)) if e.is_dir() => {
                         let buf = &mut cstr::buf::dynamic(256);
                         e.path(buf).log_ok();
-                        let path = FsPathBuf::from(cstr::buf::dynamic(256)).join(&mut *buf);
+                        let path = cstr::buf::dynamic(256).join_path(&mut *buf);
                         self.load_overlay_rc(&path, buf);
-                        let desc_path = FsPathBuf::from(cstr::buf::dynamic(256)).join(root_dir);
+                        let desc_path = cstr::buf::dynamic(256).join_path(root_dir);
                         path.copy_to(&desc_path).log_ok();
                     }
                     Ok(_) => continue,