TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-22 08:18:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make magiskpolicy supports multiple --apply

Browse Source
This commit is contained in:
LoveSy 2021-09-06 00:46:30 +08:00 committed by John Wu
parent a699dab5b3
commit 6582a4abd9
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
native/jni/magiskpolicy/magiskpolicy.cpp
View File

@ -1,4 +1,5 @@
#include <utils.hpp> #include <utils.hpp>
#include <vector>
#include <magiskpolicy.hpp> #include <magiskpolicy.hpp>
#include "sepolicy.hpp" #include "sepolicy.hpp"
@ -23,6 +24,7 @@ Options:
Magisk selinux environment Magisk selinux environment
--apply FILE apply rules from FILE, read and parsed --apply FILE apply rules from FILE, read and parsed
line by line as policy statements line by line as policy statements
(multiple --apply allows)
If neither --load or --compile-split is specified, it will load If neither --load or --compile-split is specified, it will load
from current live policies (/sys/fs/selinux/policy) from current live policies (/sys/fs/selinux/policy)
@ -34,7 +36,7 @@ from current live policies (/sys/fs/selinux/policy)
int magiskpolicy_main(int argc, char *argv[]) { int magiskpolicy_main(int argc, char *argv[]) {
cmdline_logging(); cmdline_logging();
const char *out_file = nullptr; const char *out_file = nullptr;
const char *rule_file = nullptr; std::vector<std::string_view> rule_files;
sepolicy *sepol = nullptr; sepolicy *sepol = nullptr;
bool magisk = false; bool magisk = false;
bool live = false; bool live = false;
@ -78,7 +80,7 @@ int magiskpolicy_main(int argc, char *argv[]) {
} else if (option == "apply"sv) { } else if (option == "apply"sv) {
if (argv[i + 1] == nullptr) if (argv[i + 1] == nullptr)
usage(argv[0]); usage(argv[0]);
rule_file = argv[i + 1]; rule_files.emplace_back(argv[i + 1]);
++i; ++i;
} else if (option == "help"sv) { } else if (option == "help"sv) {
statement_help(); statement_help();
@ -99,8 +101,9 @@ int magiskpolicy_main(int argc, char *argv[]) {
if (magisk) if (magisk)
sepol->magisk_rules(); sepol->magisk_rules();
if (rule_file) if (!rule_files.empty())
sepol->load_rule_file(rule_file); for (const auto &rule_file : rule_files)
sepol->load_rule_file(rule_file.data());
for (; i < argc; ++i) for (; i < argc; ++i)
sepol->parse_statement(argv[i]); sepol->parse_statement(argv[i]);