TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-03 10:01:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modernize database code

Browse Source
This commit is contained in:
topjohnwu
2018-11-04 18:24:08 -05:00
parent 5e4d2dedbe
commit 0742901cd2
7 changed files with 121 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
native/jni/daemon/bootstages.cpp
View File

@@ -910,10 +910,9 @@ core_only:
// Check whether we have a valid manager installed
sqlite3 *db = get_magiskdb();
if (db) {
struct db_strings str;
memset(&str, 0, sizeof(str));
get_db_strings(db, SU_MANAGER, &str);
if (validate_manager(str.s[SU_MANAGER], 0, nullptr)) {
db_strings str;
get_db_strings(db, &str, SU_MANAGER);
if (validate_manager(str[SU_MANAGER], 0, nullptr)) {
// There is no manager installed, install the stub
exec_command_sync("/sbin/magiskinit", "-x", "manager", "/data/magisk.apk", nullptr);
install_apk("/data/magisk.apk");

96
native/jni/daemon/db.cpp
View File

@@ -10,6 +10,66 @@
#define DB_VERSION 7
db_strings::db_strings() {
memset(data, 0, sizeof(data));
}
char *db_strings::operator[](const char *key) {
return data[getKeyIdx(key)];
}
const char *db_strings::operator[](const char *key) const {
return data[getKeyIdx(key)];
}
char *db_strings::operator[](const int idx) {
return data[idx];
}
const char *db_strings::operator[](const int idx) const {
return data[idx];
}
int db_strings::getKeyIdx(const char *key) const {
int idx = DB_STRING_NUM;
for (int i = 0; i < DB_STRING_NUM; ++i) {
if (strcmp(key, DB_STRING_KEYS[i]) == 0)
idx = i;
}
return idx;
}
db_settings::db_settings() : data {
ROOT_ACCESS_APPS_AND_ADB,
MULTIUSER_MODE_OWNER_ONLY,
NAMESPACE_MODE_REQUESTER
} {}
int &db_settings::operator[](const int idx) {
return data[idx];
}
const int &db_settings::operator[](const int idx) const {
return data[idx];
}
int &db_settings::operator[](const char *key) {
return data[getKeyIdx(key)];
}
const int &db_settings::operator[](const char *key) const {
return data[getKeyIdx(key)];
}
int db_settings::getKeyIdx(const char *key) const {
int idx = DB_SETTINGS_NUM;
for (int i = 0; i < DB_SETTINGS_NUM; ++i) {
if (strcmp(key, DB_SETTING_KEYS[i]) == 0)
idx = i;
}
return idx;
}
static int ver_cb(void *ver, int, char **data, char **) {
*((int *) ver) = atoi(data[0]);
return 0;
@@ -111,26 +171,24 @@ sqlite3 *get_magiskdb() {
}
static int settings_cb(void *v, int col_num, char **data, char **col_name) {
auto dbs = (db_settings *) v;
int key = -1, value;
auto &cfg = *(db_settings *) v;
int value = -1;
const char *key = "";
for (int i = 0; i < col_num; ++i) {
if (strcmp(col_name[i], "key") == 0) {
for (int k = 0; k < DB_SETTINGS_NUM; ++k) {
if (strcmp(data[i], DB_SETTING_KEYS[k]) == 0)
key = k;
}
key = data[i];
} else if (strcmp(col_name[i], "value") == 0) {
value = atoi(data[i]);
}
}
if (key >= 0) {
dbs->v[key] = value;
LOGD("magiskdb: query %s=[%d]\n", DB_SETTING_KEYS[key], value);
if (key[0] && value >= 0) {
cfg[key] = value;
LOGD("magiskdb: query %s=[%d]\n", key, value);
}
return 0;
}
int get_db_settings(sqlite3 *db, int key, struct db_settings *dbs) {
int get_db_settings(sqlite3 *db, struct db_settings *dbs, int key) {
if (db == nullptr)
return 1;
char *err;
@@ -150,27 +208,23 @@ int get_db_settings(sqlite3 *db, int key, struct db_settings *dbs) {
}
static int strings_cb(void *v, int col_num, char **data, char **col_name) {
auto dbs = (db_strings *) v;
int key = -1;
char *value;
auto &str = *(db_strings *) v;
const char *key = "", *value = "";
for (int i = 0; i < col_num; ++i) {
if (strcmp(col_name[i], "key") == 0) {
for (int k = 0; k < DB_STRING_NUM; ++k) {
if (strcmp(data[i], DB_STRING_KEYS[k]) == 0)
key = k;
}
key = data[i];
} else if (strcmp(col_name[i], "value") == 0) {
value = data[i];
}
}
if (key >= 0) {
strcpy(dbs->s[key], value);
LOGD("magiskdb: query %s=[%s]\n", DB_STRING_KEYS[key], value);
if (key[0] && value[0]) {
strcpy(str[key], value);
LOGD("magiskdb: query %s=[%s]\n", key, value);
}
return 0;
}
int get_db_strings(sqlite3 *db, int key, struct db_strings *str) {
int get_db_strings(sqlite3 *db, struct db_strings *str, int key) {
if (db == nullptr)
return 1;
char *err;