Use self implemented parse_mount_info

Robotition · Feb 28, 2024 · 62fc786 · 62fc786
1 parent 1a70796
commit 62fc786
Show file tree

Hide file tree

Showing 6 changed files with 121 additions and 198 deletions.
diff --git a/native/src/Cargo.lock b/native/src/Cargo.lock
diff --git a/native/src/Cargo.toml b/native/src/Cargo.toml
@@ -23,7 +23,6 @@ x509-cert = "0.2"
 der = "0.7"
 bytemuck = "1.14"
 fdt = "0.1"
-procfs = { version = "0.16", default-features = false }
 
 [workspace.dependencies.argh]
 git = "https://github.com/google/argh.git"

diff --git a/native/src/init/Cargo.toml b/native/src/init/Cargo.toml
@@ -14,4 +14,3 @@ cxx-gen = { workspace = true }
 base = { path = "../base" }
 magiskpolicy = { path = "../sepolicy" }
 cxx = { workspace = true }
-procfs = { workspace = true }
diff --git a/native/src/init/lib.rs b/native/src/init/lib.rs
@@ -17,7 +17,7 @@ pub mod ffi {
  fn setup_klog();
  fn inject_magisk_rc(fd: i32, tmp_dir: Utf8CStrRef);
  fn switch_root(path: Utf8CStrRef);
- fn is_device_mounted(dev: u64, mnt_point: &mut Vec<u8>) -> bool;
+ fn is_device_mounted(dev: u64, target: Pin<&mut CxxString>) -> bool;
  }
 
  unsafe extern "C++" {

diff --git a/native/src/init/mount.cpp b/native/src/init/mount.cpp
@@ -114,10 +114,10 @@ static void mount_preinit_dir(string preinit_dev) {
  xmkdir(PREINITMNT, 0);
  bool mounted = false;
  // First, find if it is already mounted
- rust::Vec<uint8_t> mnt_point;
+ std::string mnt_point;
  if (rust::is_device_mounted(dev, mnt_point)) {
  // Already mounted, just bind mount
- xmount((const char *) mnt_point.data(), PREINITMNT, nullptr, MS_BIND, nullptr);
+ xmount(mnt_point.data(), PREINITMNT, nullptr, MS_BIND, nullptr);
  mounted = true;
  }