TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-02 21:01:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use a better function to read through files

Browse Source
This commit is contained in:
topjohnwu
2019-02-17 22:30:23 -05:00
parent fb55fe184c
commit 14aa6041ec
5 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
native/jni/core/bootstages.cpp
View File

@@ -378,35 +378,35 @@ static bool magisk_env() {
xmkdir(SECURE_DIR "/service.d", 0755);
LOGI("* Mounting mirrors");
auto mounts = file_to_vector("/proc/mounts");
bool system_as_root = false;
for (auto &line : mounts) {
file_readline("/proc/mounts", [&](string_view &line) -> bool {
if (str_contains(line, " /system_root ")) {
bind_mount("/system_root/system", MIRRDIR "/system");
sscanf(line.c_str(), "%s", buf);
sscanf(line.data(), "%s", buf);
system_block = strdup(buf);
system_as_root = true;
} else if (!system_as_root && str_contains(line, " /system ")) {
sscanf(line.c_str(), "%s %*s %s", buf, buf2);
sscanf(line.data(), "%s %*s %s", buf, buf2);
system_block = strdup(buf);
xmount(system_block, MIRRDIR "/system", buf2, MS_RDONLY, nullptr);
VLOGI("mount", system_block, MIRRDIR "/system");
} else if (str_contains(line, " /vendor ")) {
seperate_vendor = true;
sscanf(line.c_str(), "%s %*s %s", buf, buf2);
sscanf(line.data(), "%s %*s %s", buf, buf2);
vendor_block = strdup(buf);
xmkdir(MIRRDIR "/vendor", 0755);
xmount(vendor_block, MIRRDIR "/vendor", buf2, MS_RDONLY, nullptr);
VLOGI("mount", vendor_block, MIRRDIR "/vendor");
} else if (str_contains(line, " /data ")) {
sscanf(line.c_str(), "%s", buf);
sscanf(line.data(), "%s", buf);
data_block = strdup(buf);
} else if (SDK_INT >= 24 &&
str_contains(line, " /proc ") && !str_contains(line, "hidepid=2")) {
// Enforce hidepid
xmount(nullptr, "/proc", nullptr, MS_REMOUNT, "hidepid=2,gid=3009");
}
}
return true;
});
if (!seperate_vendor) {
xsymlink(MIRRDIR "/system/vendor", MIRRDIR "/vendor");
VLOGI("link", MIRRDIR "/system/vendor", MIRRDIR "/vendor");
@@ -492,12 +492,11 @@ static void collect_modules() {
static bool check_data() {
bool mnt = false;
bool data = false;
auto mounts = file_to_vector("/proc/mounts");
for (auto &line : mounts) {
if (line.find(" /data ") != string::npos &&
line.find("tmpfs") == string::npos)
file_readline("/proc/mounts", [&](string_view &s) -> bool {
if (str_contains(s, " /data ") && !str_contains(s, "tmpfs"))
mnt = true;
}
return true;
});
if (mnt) {
auto crypto = getprop("ro.crypto.state");
if (!crypto.empty()) {