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

Fix collect modules

Browse Source
This commit is contained in:
topjohnwu 2020-05-16 13:45:22 -07:00
parent 122b4d66b6
commit aac6ad73da
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -645,29 +645,25 @@ static void prepare_modules() {
static void collect_modules() { static void collect_modules() {
auto dir = xopen_dir(MODULEROOT); auto dir = xopen_dir(MODULEROOT);
if (!dir)
return;
int dfd = dirfd(dir.get()); int dfd = dirfd(dir.get());
for (dirent *entry; (entry = xreaddir(dir.get()));) { for (dirent *entry; (entry = xreaddir(dir.get()));) {
if (entry->d_type == DT_DIR) { if (entry->d_type == DT_DIR && entry->d_name != ".core"sv) {
if (entry->d_name == ".core"sv)
continue;
int modfd = xopenat(dfd, entry->d_name, O_RDONLY); int modfd = xopenat(dfd, entry->d_name, O_RDONLY);
run_finally f([=]{ close(modfd); });
if (faccessat(modfd, "remove", F_OK, 0) == 0) { if (faccessat(modfd, "remove", F_OK, 0) == 0) {
LOGI("%s: remove\n", entry->d_name); LOGI("%s: remove\n", entry->d_name);
auto uninstaller = MODULEROOT + "/"s + entry->d_name + "/uninstall.sh"; auto uninstaller = MODULEROOT + "/"s + entry->d_name + "/uninstall.sh";
if (access(uninstaller.data(), F_OK) == 0) if (access(uninstaller.data(), F_OK) == 0)
exec_script(uninstaller.data()); exec_script(uninstaller.data());
frm_rf(xdup(modfd)); frm_rf(modfd);
unlinkat(dfd, entry->d_name, AT_REMOVEDIR); unlinkat(dfd, entry->d_name, AT_REMOVEDIR);
continue; continue;
} }
unlinkat(modfd, "update", 0); unlinkat(modfd, "update", 0);
if (faccessat(modfd, "disable", F_OK, 0) != 0) if (faccessat(modfd, "disable", F_OK, 0) != 0)
module_list.emplace_back(entry->d_name); module_list.emplace_back(entry->d_name);
close(modfd);
} }
} }
} }