Mirrors/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-06-12 13:17:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Install both 32 and 64 bit binaries

Browse Source
This commit is contained in:
topjohnwu
2021-01-18 12:37:08 -08:00
parent 5a71998b4e
commit d2bc2cfcf8
5 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
native/jni/core/applets.cpp
View File

@ -35,7 +35,8 @@ int main(int argc, char *argv[]) {
cmdline_logging();
init_argv0(argc, argv);
if (basename(argv[0]) == "magisk"sv) {
string_view base = basename(argv[0]);
if (base == "magisk" || base == "magisk32" || base == "magisk64") {
if (argc > 1 && argv[1][0] != '-') {
// Calling applet via magisk [applet] args
--argc;

11
native/jni/core/restorecon.cpp
View File

@ -93,10 +93,9 @@ void restore_tmpcon() {
auto dir = xopen_dir(MAGISKTMP.data());
int dfd = dirfd(dir.get());
for (dirent *entry; (entry = xreaddir(dir.get()));) {
if (SDK_INT >= 26 && entry->d_name == "magisk"sv)
setfilecon_at(dfd, entry->d_name, EXEC_CON);
else
setfilecon_at(dfd, entry->d_name, SYSTEM_CON);
}
for (dirent *entry; (entry = xreaddir(dir.get()));)
setfilecon_at(dfd, entry->d_name, SYSTEM_CON);
string magisk = MAGISKTMP + "/magisk";
setfilecon(magisk.data(), EXEC_CON);
}