TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-12-25 07:37:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

magisk_node: check target exists

Browse Source
This commit is contained in:
vvb2060 2022-07-22 16:53:33 +08:00 committed by John Wu
parent d35072d4e6
commit 00d3cb0908
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
native/jni/core/module.cpp
View File

@ -522,6 +522,10 @@ public:
explicit magisk_node(const char *name) : node_entry(name, DT_REG, this) {} explicit magisk_node(const char *name) : node_entry(name, DT_REG, this) {}
void mount() override { void mount() override {
const string src = MAGISKTMP + "/" + name();
if (access(src.data(), F_OK))
return;
const string &dir_name = parent()->node_path(); const string &dir_name = parent()->node_path();
if (name() == "magisk") { if (name() == "magisk") {
for (int i = 0; applet_names[i]; ++i) { for (int i = 0; applet_names[i]; ++i) {
@ -534,7 +538,7 @@ public:
VLOGD("create", "./magiskpolicy", dest.data()); VLOGD("create", "./magiskpolicy", dest.data());
xsymlink("./magiskpolicy", dest.data()); xsymlink("./magiskpolicy", dest.data());
} }
create_and_mount(MAGISKTMP + "/" + name()); create_and_mount(src);
} }
}; };
@ -624,7 +628,7 @@ void magic_mount() {
if (!system->is_empty()) { if (!system->is_empty()) {
// Handle special read-only partitions // Handle special read-only partitions
for (const char *part : { "/vendor", "/product", "/system_ext" }) { for (const char *part : { "/vendor", "/product", "/system_ext" }) {
struct stat st; struct stat st{};
if (lstat(part, &st) == 0 && S_ISDIR(st.st_mode)) { if (lstat(part, &st) == 0 && S_ISDIR(st.st_mode)) {
if (auto old = system->extract(part + 1)) { if (auto old = system->extract(part + 1)) {
auto new_node = new root_node(old); auto new_node = new root_node(old);