br0kenpixel/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-09-06 06:36:58 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Improve byte_data const correctness

Browse Source
This commit is contained in:
topjohnwu
2023-06-03 03:16:03 -07:00
parent 57afae3425
commit 2a654e5d7f
17 changed files with 186 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files
native/src/init/getinfo.cpp
+1 -1
View File
@@ -213,7 +213,7 @@ bool check_two_stage() {
if (access("/system/bin/init", F_OK) == 0)
return true;
// If we still have no indication, parse the original init and see what's up
auto init = mmap_data(backup_init());
mmap_data init(backup_init());
return init.contains("selinux_setup");
}
native/src/init/rootdir.cpp
+8 -8
View File
@@ -164,27 +164,27 @@ static void extract_files(bool sbin) {
const char *stub_xz = sbin ? "/sbin/stub.xz" : "stub.xz";
if (access(m32, F_OK) == 0) {
auto magisk = mmap_data(m32);
mmap_data magisk(m32);
unlink(m32);
int fd = xopen("magisk32", O_WRONLY | O_CREAT, 0755);
unxz(fd, magisk.buf, magisk.sz);
unxz(fd, magisk.buf(), magisk.sz());
close(fd);
}
if (access(m64, F_OK) == 0) {
auto magisk = mmap_data(m64);
mmap_data magisk(m64);
unlink(m64);
int fd = xopen("magisk64", O_WRONLY | O_CREAT, 0755);
unxz(fd, magisk.buf, magisk.sz);
unxz(fd, magisk.buf(), magisk.sz());
close(fd);
xsymlink("./magisk64", "magisk");
} else {
xsymlink("./magisk32", "magisk");
}
if (access(stub_xz, F_OK) == 0) {
auto stub = mmap_data(stub_xz);
mmap_data stub(stub_xz);
unlink(stub_xz);
int fd = xopen("stub.apk", O_WRONLY | O_CREAT, 0);
unxz(fd, stub.buf, stub.sz);
unxz(fd, stub.buf(), stub.sz());
close(fd);
}
}
@@ -242,11 +242,11 @@ void MagiskInit::patch_ro_root() {
// Handle avd hack
if (avd_hack) {
int src = xopen("/init", O_RDONLY | O_CLOEXEC);
auto init = mmap_data("/init");
mmap_data init("/init");
// Force disable early mount on original init
init.patch({ make_pair("android,fstab", "xxx") });
int dest = xopen(ROOTOVL "/init", O_CREAT | O_WRONLY | O_CLOEXEC, 0);
xwrite(dest, init.buf, init.sz);
xwrite(dest, init.buf(), init.sz());
fclone_attr(src, dest);
close(src);
close(dest);
native/src/init/twostage.cpp
+2 -2
View File
@@ -21,9 +21,9 @@ void LegacySARInit::first_stage_prep() {
int src = xopen("/init", O_RDONLY);
int dest = xopen("/data/init", O_CREAT | O_WRONLY, 0);
{
auto init = mmap_data("/init");
mmap_data init("/init");
init.patch({ make_pair(INIT_PATH, REDIR_PATH) });
write(dest, init.buf, init.sz);
write(dest, init.buf(), init.sz());
fclone_attr(src, dest);
close(dest);
close(src);