From a6124a6a5e26040348425dd0557492316993871c Mon Sep 17 00:00:00 2001 From: ThePedroo Date: Fri, 8 Nov 2024 17:21:26 -0300 Subject: [PATCH] improve: Zygiskd Magisk code This commit improves the Zygiskd Magisk code by avoiding redundant code and reducing complexity. --- zygiskd/src/root_impl/magisk.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/zygiskd/src/root_impl/magisk.c b/zygiskd/src/root_impl/magisk.c index 768f849..298dc55 100644 --- a/zygiskd/src/root_impl/magisk.c +++ b/zygiskd/src/root_impl/magisk.c @@ -134,7 +134,8 @@ bool magisk_uid_should_umount(uid_t uid) { LOGE("Failed to execute pm binary: %s\n", strerror(errno)); errno = 0; - return false; /* INFO: It's better if we do NOT umount than the opposite */ + /* INFO: It's better if we do NOT umount than the opposite */ + return false; } if (result[0] == '\0') { @@ -150,7 +151,6 @@ bool magisk_uid_should_umount(uid_t uid) { char *const argv[] = { "magisk", "--sqlite", sqlite_cmd, NULL }; - result[0] = '\0'; if (!exec_command(result, sizeof(result), (const char *)path_to_magisk, argv)) { LOGE("Failed to execute magisk binary: %s\n", strerror(errno)); errno = 0; @@ -162,12 +162,9 @@ bool magisk_uid_should_umount(uid_t uid) { } bool magisk_uid_is_manager(uid_t uid) { - char sqlite_cmd[256]; - snprintf(sqlite_cmd, sizeof(sqlite_cmd), "select value from strings where key=\"requester\" limit 1"); + char *const argv[] = { "magisk", "--sqlite", "select value from strings where key=\"requester\" limit 1", NULL }; - char *const argv[] = { "magisk", "--sqlite", sqlite_cmd, NULL }; - - char output[128] = { 0 }; + char output[128]; if (!exec_command(output, sizeof(output), (const char *)path_to_magisk, argv)) { LOGE("Failed to execute magisk binary: %s\n", strerror(errno)); errno = 0;