topjohnwu/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-23 12:09:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use parse_impl for partition_map

Browse Source
This commit is contained in:
LoveSy 2024-08-08 18:11:40 +08:00 committed by John Wu
parent 1f974cb220
commit 3a0becc783
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
native/src/init/getinfo.cpp
View File

@ -41,16 +41,16 @@ static string extract_quoted_str_until(chars<escapes...>, chars<breaks...>,
}
// Parse string into key value pairs.
// The string format: [delim][key][padding]=[padding][value][delim]
template<char delim, char... padding>
// The string format: [delim][key][padding][eq][padding][value][delim]
template<char delim, char eq, char... padding>
static kv_pairs parse_impl(chars<padding...>, string_view str) {
kv_pairs kv;
char skip_array[] = {'=', padding...};
char skip_array[] = {eq, padding...};
string_view skip(skip_array, std::size(skip_array));
bool quoted = false;
for (size_t pos = 0u; pos < str.size(); pos = str.find_first_not_of(delim, pos)) {
auto key = extract_quoted_str_until(
chars<padding..., delim>{}, chars<'='>{}, str, pos, quoted);
chars<padding..., delim>{}, chars<eq>{}, str, pos, quoted);
pos = str.find_first_not_of(skip, pos);
if (pos == string_view::npos || str[pos] == delim) {
kv.emplace_back(key, "");
@ -63,10 +63,13 @@ static kv_pairs parse_impl(chars<padding...>, string_view str) {
}
static kv_pairs parse_cmdline(string_view str) {
return parse_impl<' '>(chars<>{}, str);
return parse_impl<' ', '='>(chars<>{}, str);
}
static kv_pairs parse_bootconfig(string_view str) {
return parse_impl<'\n'>(chars<' '>{}, str);
return parse_impl<'\n', '='>(chars<' '>{}, str);
}
static kv_pairs parse_partition_map(std::string_view str) {
return parse_impl<';', ','>(chars<>{}, str);
}
#define test_bit(bit, array) (array[bit / 8] & (1 << (bit % 8)))
@ -214,25 +217,16 @@ void load_kernel_info(BootConfig *config) {
// https://android.googlesource.com/platform/system/core/+/refs/heads/android13-release/init/devices.cpp#191
kv_pairs load_partition_map() {
kv_pairs partition_map;
auto fn = [&partition_map](const kv_pairs &kv) {
for (const auto &[key, value] : kv) {
if (key != "androidboot.partition_map")
continue;
for (const auto &map : split(value, ";")) {
auto map_pieces = split(map, ",");
if (map_pieces.size() != 2) {
LOGE("Expected a comma separated device,partition mapping, but found '%s'", map.c_str());
continue;
}
partition_map.emplace_back(map_pieces[0], map_pieces[1]);
}
}
};
fn(parse_cmdline(full_read("/proc/cmdline")));
fn(parse_bootconfig(full_read("/proc/bootconfig")));
return partition_map;
const string_view kPartitionMapKey = "androidboot.partition_map";
for (const auto &[key, value] : parse_cmdline(full_read("/proc/cmdline"))) {
if (key == kPartitionMapKey)
return parse_partition_map(value);
}
for (const auto &[key, value] : parse_bootconfig(full_read("/proc/bootconfig"))) {
if (key == kPartitionMapKey)
return parse_partition_map(value);
}
return {};
}
std::string get_partition_name_for_device(const kv_pairs &partition_map, const std::string &query_device){