From 836bfbdd028c19d22e3dbb11a478ea397b7a7ca4 Mon Sep 17 00:00:00 2001 From: topjohnwu Date: Wed, 22 Jan 2020 01:17:30 +0800 Subject: [PATCH] Wrapper is no longer needed --- native/jni/core/applets.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/native/jni/core/applets.cpp b/native/jni/core/applets.cpp index 4932bc9e0..fdeec2536 100644 --- a/native/jni/core/applets.cpp +++ b/native/jni/core/applets.cpp @@ -10,8 +10,9 @@ using namespace std::literals; -static int (*applet_main[]) (int, char *[]) = - { su_client_main, resetprop_main, magiskhide_main, nullptr }; +using main_fun = int (*)(int, char *[]); + +static main_fun applet_main[] = { su_client_main, resetprop_main, magiskhide_main, nullptr }; [[noreturn]] static void call_applet(int argc, char **argv) { // Applets @@ -30,14 +31,6 @@ int main(int argc, char *argv[]) { cmdline_logging(); init_argv0(argc, argv); - if (basename(argv[0]) == "magisk.bin"sv) { - if (argc == 1) - return 1; - // Running through wrapper - --argc; - ++argv; - } - if (basename(argv[0]) == "magisk"sv) { if (argc > 1 && argv[1][0] != '-') { // Calling applet via magisk [applet] args