From a85c4c6528c1a73fc52c21bbb7915b894a6abfa4 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Thu, 30 Jan 2025 20:20:37 +0800
Subject: [PATCH] Move MagiskInit::MagiskInit to rust

---
 native/src/init/init.cpp | 20 ----------
 native/src/init/lib.rs   | 84 ++++++++++++++++++++++++++++++----------
 2 files changed, 63 insertions(+), 41 deletions(-)

diff --git a/native/src/init/init.cpp b/native/src/init/init.cpp
index d875046ba..ec00297fd 100644
--- a/native/src/init/init.cpp
+++ b/native/src/init/init.cpp
@@ -60,26 +60,6 @@ void restore_ramdisk_init() {
     }
 }
 
-void MagiskInit::init() noexcept {
-    // Get kernel data using procfs and sysfs
-    if (access("/proc/cmdline", F_OK) != 0) {
-        xmkdir("/proc", 0755);
-        xmount("proc", "/proc", "proc", 0, nullptr);
-        mount_list.emplace_back("/proc");
-    }
-    if (access("/sys/block", F_OK) != 0) {
-        xmkdir("/sys", 0755);
-        xmount("sysfs", "/sys", "sysfs", 0, nullptr);
-        mount_list.emplace_back("/sys");
-    }
-
-    // Log to kernel
-    rust::setup_klog();
-
-    // Load kernel configs
-    config.init();
-}
-
 static void recovery() {
     LOGI("Ramdisk is recovery, abort\n");
     restore_ramdisk_init();
diff --git a/native/src/init/lib.rs b/native/src/init/lib.rs
index 94ef77ebc..bd797b1d5 100644
--- a/native/src/init/lib.rs
+++ b/native/src/init/lib.rs
@@ -2,12 +2,18 @@
 #![feature(once_cell_try)]
 #![feature(try_blocks)]
 
+use base::{
+    cstr,
+    libc::{mount},
+    raw_cstr, FsPath, LibcReturn, LoggedResult,
+};
 use logging::setup_klog;
 use mount::{is_device_mounted, switch_root};
 use rootdir::{collect_overlay_contexts, inject_magisk_rc, reset_overlay_contexts};
 // Has to be pub so all symbols in that crate is included
-pub use magiskpolicy;
 use crate::ffi::{BootConfig, MagiskInit};
+pub use magiskpolicy;
+use std::ptr::null as nullptr;
 
 mod logging;
 mod mount;
@@ -85,28 +91,64 @@ pub mod ffi {
         fn legacy_system_as_root(self: &mut MagiskInit);
         fn rootfs(self: &mut MagiskInit);
         fn start(self: &mut MagiskInit);
-        fn init(self: &mut MagiskInit);
     }
 }
 
 pub(crate) fn start_magisk_init(argv: *mut *mut std::ffi::c_char) {
-    let mut init = MagiskInit {
-        preinit_dev: String::new(),
-        mount_list: Vec::new(),
-        argv,
-        config: BootConfig {
-            skip_initramfs: false,
-            force_normal_boot: false,
-            rootwait: false,
-            emulator: false,
-            slot: [0; 3],
-            dt_dir: [0; 64],
-            fstab_suffix: [0; 32],
-            hardware: [0; 32],
-            hardware_plat: [0; 32],
-            partition_map: Vec::new(),
-        },
-    };
-    init.init();
-    init.start();
+    fn inner(argv: *mut *mut std::ffi::c_char) -> LoggedResult<()> {
+        let mut init = MagiskInit {
+            preinit_dev: String::new(),
+            mount_list: Vec::new(),
+            argv,
+            config: BootConfig {
+                skip_initramfs: false,
+                force_normal_boot: false,
+                rootwait: false,
+                emulator: false,
+                slot: [0; 3],
+                dt_dir: [0; 64],
+                fstab_suffix: [0; 32],
+                hardware: [0; 32],
+                hardware_plat: [0; 32],
+                partition_map: Vec::new(),
+            },
+        };
+        if !FsPath::from(cstr!("/proc/cmdline")).exists() {
+            FsPath::from(cstr!("/proc")).mkdir(0o755)?;
+            unsafe {
+                mount(
+                    raw_cstr!("proc"),
+                    raw_cstr!("/proc"),
+                    raw_cstr!("proc"),
+                    0,
+                    nullptr(),
+                )
+            }
+            .as_os_err()?;
+            init.mount_list.push("/proc".to_string());
+        }
+        if !FsPath::from(cstr!("/sys/block")).exists() {
+            FsPath::from(cstr!("/sys")).mkdir(0o755)?;
+            unsafe {
+                mount(
+                    raw_cstr!("sysfs"),
+                    raw_cstr!("/sys"),
+                    raw_cstr!("sysfs"),
+                    0,
+                    nullptr(),
+                )
+            }
+            .as_os_err()?;
+            init.mount_list.push("/sys".to_string());
+        }
+
+        setup_klog();
+
+        init.config.init();
+
+        init.start();
+        Ok(())
+    }
+
+    inner(argv).ok();
 }