manager: use busybox for tar and du commands as not all devices has it most likely and if module size is 0 bytes then show null

manager/app/src/main/java/com/rifsxd/ksunext/ui/screen/Module.kt

@@ -1089,6 +1089,7 @@ fun ModuleItem(
 }
 
 fun formatSize(size: Long): String {
+    if (size == 0L) return "null"
     val kb = 1024
     val mb = kb * 1024
     val gb = mb * 1024

manager/app/src/main/java/com/rifsxd/ksunext/ui/util/KsuCli.kt

@@ -28,6 +28,7 @@ import java.io.File
  * @date 2023/1/1.
  */
 private const val TAG = "KsuCli"
+private const val BUSYBOX = "/data/adb/ksu/bin/busybox"
 
 private fun ksuDaemonMagicPath(): String {
     return ksuApp.applicationInfo.nativeLibraryDir + File.separator + "libksud_magic.so"
@@ -490,7 +491,7 @@ fun moduleBackup(): Boolean {
     val internalBackupDir = "/sdcard/.ksunext/modules"
     val internalBackupPath = "$internalBackupDir/$tarName"
 
-    val tarCmd = "tar -cpf $tarPath -C /data/adb/modules $(ls /data/adb/modules)"
+    val tarCmd = "$BUSYBOX tar -cpf $tarPath -C /data/adb/modules $(ls /data/adb/modules)"
     val tarResult = ShellUtils.fastCmd(shell, tarCmd).trim()
     if (tarResult.isNotEmpty()) return false
 
@@ -511,7 +512,7 @@ fun moduleRestore(): Boolean {
     val tarPath = ShellUtils.fastCmd(shell, findTarCmd).trim()
     if (tarPath.isEmpty()) return false
 
-    val extractCmd = "tar -xpf $tarPath -C /data/adb/modules_update"
+    val extractCmd = "$BUSYBOX tar -xpf $tarPath -C /data/adb/modules_update"
     val extractResult = ShellUtils.fastCmd(shell, extractCmd).trim()
     return extractResult.isEmpty()
 }
@@ -533,7 +534,7 @@ fun allowlistBackup(): Boolean {
     val internalBackupDir = "/sdcard/.ksunext/allowlist"
     val internalBackupPath = "$internalBackupDir/$tarName"
 
-    val tarCmd = "tar -cpf $tarPath -C /data/adb/ksu .allowlist"
+    val tarCmd = "$BUSYBOX tar -cpf $tarPath -C /data/adb/ksu .allowlist"
     val tarResult = ShellUtils.fastCmd(shell, tarCmd).trim()
     if (tarResult.isNotEmpty()) return false
 
@@ -556,7 +557,7 @@ fun allowlistRestore(): Boolean {
     if (tarPath.isEmpty()) return false
 
     // Extract the tar to /data/adb/ksu (restores .allowlist folder with permissions)
-    val extractCmd = "tar -xpf $tarPath -C /data/adb/ksu"
+    val extractCmd = "$BUSYBOX tar -xpf $tarPath -C /data/adb/ksu"
     val extractResult = ShellUtils.fastCmd(shell, extractCmd).trim()
     return extractResult.isEmpty()
 }
@@ -623,7 +624,7 @@ fun currentMountSystem(): String {
 
 fun getModuleSize(dir: File): Long {
     val shell = getRootShell()
-    val cmd = "du -sb '${dir.absolutePath}' | awk '{print \$1}'"
+    val cmd = "$BUSYBOX du -sb '${dir.absolutePath}' | awk '{print \$1}'"
     val result = ShellUtils.fastCmd(shell, cmd).trim()
     return result.toLongOrNull() ?: 0L
 }

userspace/ksud_magic/src/boot_patch.rs

@@ -194,6 +194,23 @@ fn is_magisk_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
     Ok(status.code() == Some(1))
 }
 
+fn is_magisk_patched_vendor(magiskboot: &Path, workdir: &Path) -> Result<bool> {
+    let vendor_ramdisk_cpio = workdir.join("vendor_ramdisk").join("init_boot.cpio");
+    let status = Command::new(magiskboot)
+        .current_dir(workdir)
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .args([
+            "cpio",
+            vendor_ramdisk_cpio.to_str().unwrap(),
+            "test",
+        ])
+        .status()?;
+
+    // 0: stock, 1: magisk
+    Ok(status.code() == Some(1))
+}
+
 fn is_kernelsu_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
     let status = Command::new(magiskboot)
         .current_dir(workdir)
@@ -205,6 +222,22 @@ fn is_kernelsu_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
     Ok(status.success())
 }
 
+fn is_kernelsu_patched_vendor(magiskboot: &Path, workdir: &Path) -> Result<bool> {
+    let vendor_ramdisk_cpio = workdir.join("vendor_ramdisk").join("init_boot.cpio");
+    let status = Command::new(magiskboot)
+        .current_dir(workdir)
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .args([
+            "cpio",
+            vendor_ramdisk_cpio.to_str().unwrap(),
+            "exists kernelsu.ko",
+        ])
+        .status()?;
+
+    Ok(status.success())
+}
+
 fn dd<P: AsRef<Path>, Q: AsRef<Path>>(ifile: P, ofile: Q) -> Result<()> {
     let status = Command::new("dd")
         .stdout(Stdio::null())
@@ -251,8 +284,9 @@ pub fn restore(
 
     let no_ramdisk = !workdir.join("ramdisk.cpio").exists();
     let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?;
+    let is_kernelsu_patched_vendor = is_kernelsu_patched_vendor(&magiskboot, workdir)?;
     ensure!(
-        is_kernelsu_patched,
+        is_kernelsu_patched || is_kernelsu_patched_vendor,
         "boot image is not patched by KernelSU Next"
     );
 
@@ -482,16 +516,18 @@ fn do_patch(
 
     let no_ramdisk = !workdir.join("ramdisk.cpio").exists();
     let is_magisk_patched = is_magisk_patched(&magiskboot, workdir)?;
+    let is_magisk_patched_vendor = is_magisk_patched_vendor(&magiskboot, workdir)?;
     ensure!(
-        no_ramdisk || !is_magisk_patched,
+        no_ramdisk || !is_magisk_patched || !is_magisk_patched_vendor,
         "Cannot work with Magisk patched image"
     );
 
     println!("- Adding KernelSU Next LKM");
     let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?;
+    let is_kernelsu_patched_vendor = is_kernelsu_patched_vendor(&magiskboot, workdir)?;
 
     let mut need_backup = false;
-    if !is_kernelsu_patched {
+    if !is_kernelsu_patched || !is_kernelsu_patched_vendor {
         if no_ramdisk {
             // vendor ramdisk patching
             let status = do_vendor_cpio_cmd(&magiskboot, workdir, "exists init");

userspace/ksud_overlayfs/src/boot_patch.rs

@@ -194,6 +194,23 @@ fn is_magisk_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
     Ok(status.code() == Some(1))
 }
 
+fn is_magisk_patched_vendor(magiskboot: &Path, workdir: &Path) -> Result<bool> {
+    let vendor_ramdisk_cpio = workdir.join("vendor_ramdisk").join("init_boot.cpio");
+    let status = Command::new(magiskboot)
+        .current_dir(workdir)
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .args([
+            "cpio",
+            vendor_ramdisk_cpio.to_str().unwrap(),
+            "test",
+        ])
+        .status()?;
+
+    // 0: stock, 1: magisk
+    Ok(status.code() == Some(1))
+}
+
 fn is_kernelsu_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
     let status = Command::new(magiskboot)
         .current_dir(workdir)
@@ -205,6 +222,22 @@ fn is_kernelsu_patched(magiskboot: &Path, workdir: &Path) -> Result<bool> {
     Ok(status.success())
 }
 
+fn is_kernelsu_patched_vendor(magiskboot: &Path, workdir: &Path) -> Result<bool> {
+    let vendor_ramdisk_cpio = workdir.join("vendor_ramdisk").join("init_boot.cpio");
+    let status = Command::new(magiskboot)
+        .current_dir(workdir)
+        .stdout(Stdio::null())
+        .stderr(Stdio::null())
+        .args([
+            "cpio",
+            vendor_ramdisk_cpio.to_str().unwrap(),
+            "exists kernelsu.ko",
+        ])
+        .status()?;
+
+    Ok(status.success())
+}
+
 fn dd<P: AsRef<Path>, Q: AsRef<Path>>(ifile: P, ofile: Q) -> Result<()> {
     let status = Command::new("dd")
         .stdout(Stdio::null())
@@ -251,8 +284,9 @@ pub fn restore(
 
     let no_ramdisk = !workdir.join("ramdisk.cpio").exists();
     let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?;
+    let is_kernelsu_patched_vendor = is_kernelsu_patched_vendor(&magiskboot, workdir)?;
     ensure!(
-        is_kernelsu_patched,
+        is_kernelsu_patched || is_kernelsu_patched_vendor,
         "boot image is not patched by KernelSU Next"
     );
 
@@ -482,16 +516,18 @@ fn do_patch(
 
     let no_ramdisk = !workdir.join("ramdisk.cpio").exists();
     let is_magisk_patched = is_magisk_patched(&magiskboot, workdir)?;
+    let is_magisk_patched_vendor = is_magisk_patched_vendor(&magiskboot, workdir)?;
     ensure!(
-        no_ramdisk || !is_magisk_patched,
+        no_ramdisk || !is_magisk_patched || !is_magisk_patched_vendor,
         "Cannot work with Magisk patched image"
     );
 
     println!("- Adding KernelSU Next LKM");
     let is_kernelsu_patched = is_kernelsu_patched(&magiskboot, workdir)?;
+    let is_kernelsu_patched_vendor = is_kernelsu_patched_vendor(&magiskboot, workdir)?;
 
     let mut need_backup = false;
-    if !is_kernelsu_patched {
+    if !is_kernelsu_patched || !is_kernelsu_patched_vendor {
         if no_ramdisk {
             // vendor ramdisk patching
             let status = do_vendor_cpio_cmd(&magiskboot, workdir, "exists init");