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

Fix coding errors and minor changes

Browse Source
This commit is contained in:
topjohnwu
2020-10-28 04:17:34 -07:00
parent d0b6318b90
commit 0feab753fb
2 changed files with 24 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
native/jni/init/getinfo.cpp
View File

@@ -12,7 +12,7 @@
using namespace std;
template<typename Func>
static void parse_cmdline(Func fn) {
static void parse_cmdline(const Func &fn) {
char cmdline[4096];
int fd = xopen("/proc/cmdline", O_RDONLY | O_CLOEXEC);
cmdline[read(fd, cmdline, sizeof(cmdline))] = '\0';
@@ -140,7 +140,7 @@ void load_kernel_info(cmdline *cmd) {
// Log to kernel
setup_klog();
parse_cmdline([=](auto key, auto value) -> void {
parse_cmdline([=](string_view key, const char *value) -> void {
if (key == "androidboot.slot_suffix") {
strcpy(cmd->slot, value);
} else if (key == "androidboot.slot") {
@@ -161,6 +161,15 @@ void load_kernel_info(cmdline *cmd) {
}
});
LOGD("Device info:\n");
LOGD("skip_initramfs=[%d]\n", cmd->skip_initramfs);
LOGD("force_normal_boot=[%d]\n", cmd->force_normal_boot);
LOGD("slot=[%s]\n", cmd->slot);
LOGD("dt_dir=[%s]\n", cmd->dt_dir);
LOGD("fstab_suffix=[%s]\n", cmd->fstab_suffix);
LOGD("hardware=[%s]\n", cmd->hardware);
LOGD("hardware.platform=[%s]\n", cmd->hardware_plat);
parse_prop_file("/.backup/.magisk", [=](auto key, auto value) -> bool {
if (key == "RECOVERYMODE" && value == "true") {
LOGD("Running in recovery mode, waiting for key...\n");
@@ -172,14 +181,6 @@ void load_kernel_info(cmdline *cmd) {
if (cmd->dt_dir[0] == '\0')
strcpy(cmd->dt_dir, DEFAULT_DT_DIR);
LOGD("Device info:\n");
LOGD("skip_initramfs=[%d]\n", cmd->skip_initramfs);
LOGD("force_normal_boot=[%d]\n", cmd->force_normal_boot);
LOGD("slot=[%s]\n", cmd->slot);
LOGD("dt_dir=[%s]\n", cmd->dt_dir);
LOGD("hardware=[%s]\n", cmd->hardware);
LOGD("hardware.platform=[%s]\n", cmd->hardware_plat);
}
bool check_two_stage() {