gitea-mirror/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-22 23:26:42 -08:00
Code Issues Packages Projects Releases Wiki Activity

Minor code cleanups

Browse Source
This commit is contained in:
topjohnwu
2020-09-02 02:49:32 -07:00
parent 2eee335b5f
commit b73d5753f2
6 changed files with 101 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
native/jni/init/mount.cpp
View File

@@ -219,7 +219,7 @@ static void mount_persist(const char *dev_base, const char *mnt_base) {
}
void RootFSInit::early_mount() {
full_read("/init", self.buf, self.sz);
self = raw_data::read("/init");
LOGD("Restoring /init\n");
rename("/.backup/init", "/init");
@@ -236,9 +236,9 @@ void SARBase::backup_files() {
if (access("/overlay.d", F_OK) == 0)
backup_folder("/overlay.d", overlays);
full_read("/proc/self/exe", self.buf, self.sz);
self = raw_data::read("/proc/self/exe");
if (access("/.backup/.magisk", R_OK) == 0)
full_read("/.backup/.magisk", config.buf, config.sz);
config = raw_data::read("/.backup/.magisk");
}
void SARBase::mount_system_root() {
@@ -304,14 +304,11 @@ void BaseInit::cleanup() {
static void patch_socket_name(const char *path) {
char rstr[16];
gen_rand_str(rstr, sizeof(rstr));
char *buf;
size_t size;
mmap_rw(path, buf, size);
raw_data_patch(buf, size, { make_pair(MAIN_SOCKET, rstr) });
munmap(buf, size);
auto bin = raw_data::mmap_rw(path);
bin.patch({ make_pair(MAIN_SOCKET, rstr) });
}
void setup_tmp(const char *path, const raw_data &self, const raw_data &config) {
void setup_tmp(const char *path, const data_holder &self, const data_holder &config) {
LOGD("Setup Magisk tmp at %s\n", path);
xmount("tmpfs", path, "tmpfs", 0, "mode=755");