TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-01-11 18:43:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small refactoring

Browse Source
This commit is contained in:
topjohnwu 2022-01-02 16:09:03 -08:00
parent 1e77e0862a
commit f4926cb822
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
native/jni/init/twostage.cpp
View File

@ -27,11 +27,7 @@ void fstab_entry::to_file(FILE *fp) {
line[val##1] = '\0'; \ line[val##1] = '\0'; \
entry.val = &line[val##0]; entry.val = &line[val##0];
static bool read_fstab_file(const char *fstab_file, vector<fstab_entry> &fstab) { static void read_fstab_file(const char *fstab_file, vector<fstab_entry> &fstab) {
if (!fstab_file || fstab_file[0] == '\0') {
LOGE("fstab file is empty");
return false;
}
file_readline(fstab_file, [&](string_view l) -> bool { file_readline(fstab_file, [&](string_view l) -> bool {
if (l[0] == '#' || l.length() == 1) if (l[0] == '#' || l.length() == 1)
return true; return true;
@ -55,7 +51,6 @@ static bool read_fstab_file(const char *fstab_file, vector<fstab_entry> &fstab)
fstab.emplace_back(std::move(entry)); fstab.emplace_back(std::move(entry));
return true; return true;
}); });
return true;
} }
#define FSR "/first_stage_ramdisk" #define FSR "/first_stage_ramdisk"
@ -204,15 +199,14 @@ void FirstStageInit::prepare() {
// When dt fstab fails, fall back to default fstab // When dt fstab fails, fall back to default fstab
LOGI("dt fstab contains error, fall back to default fstab\n"); LOGI("dt fstab contains error, fall back to default fstab\n");
fstab.clear(); fstab.clear();
if (!read_fstab_file(fstab_file, fstab)) read_fstab_file(fstab_file, fstab);
return;
} else { } else {
// Patch init to force IsDtFstabCompatible() return false // Patch init to force IsDtFstabCompatible() return false
auto init = mmap_data("/init", true); auto init = mmap_data("/init", true);
init.patch({make_pair("android,fstab", "xxx")}); init.patch({make_pair("android,fstab", "xxx")});
} }
} else if (!read_fstab_file(fstab_file, fstab)) { } else {
return; read_fstab_file(fstab_file, fstab);
} }
// Append oppo's custom fstab // Append oppo's custom fstab