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

Rewrite environment setup

Browse Source
This commit is contained in:
topjohnwu
2017-08-31 02:20:06 +08:00
parent bb39a01361
commit 189c671ce2
3 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
jni/daemon/bootstages.c
View File

@@ -26,6 +26,8 @@ static char *buf, *buf2;
static struct vector module_list;
static int seperate_vendor = 0;
extern char **environ;
#ifdef MAGISK_DEBUG
static int debug_log_pid, debug_log_fd;
#endif
@@ -114,14 +116,34 @@ static struct node_entry *insert_child(struct node_entry *p, struct node_entry *
}
/***********
* Scripts *
* setenvs *
***********/
static void bb_setenv() {
snprintf(buf, PATH_MAX, "%s:%s", BBPATH, getenv("PATH"));
setenv("PATH", buf, 1);
static void bb_setenv(struct vector *v) {
for (int i = 0; environ[i]; ++i) {
if (strncmp(environ[i], "PATH=", 5) == 0) {
snprintf(buf, PATH_MAX, "PATH=%s:%s", BBPATH, strchr(environ[i], '=') + 1);
vec_push_back(v, strdup(buf));
} else {
vec_push_back(v, strdup(environ[i]));
}
}
vec_push_back(v, NULL);
}
static void pm_setenv(struct vector *v) {
for (int i = 0; environ[i]; ++i) {
if (strncmp(environ[i], "CLASSPATH=", 10) != 0)
vec_push_back(v, strdup(environ[i]));
}
vec_push_back(v, strdup("CLASSPATH=/system/framework/pm.jar"));
vec_push_back(v, NULL);
}
/***********
* Scripts *
***********/
static void exec_common_script(const char* stage) {
DIR *dir;
struct dirent *entry;
@@ -560,9 +582,8 @@ void post_fs_data(int client) {
// uninstaller
if (access(UNINSTALLER, F_OK) == 0) {
close(open(UNBLOCKFILE, O_RDONLY | O_CREAT));
bb_setenv();
setenv("BOOTMODE", "true", 1);
exec_command(0, NULL, NULL, "sh", UNINSTALLER, NULL);
exec_command(0, NULL, bb_setenv, "sh", UNINSTALLER, NULL);
return;
}
@@ -669,10 +690,6 @@ unblock:
unblock_boot_process();
}
static void pm_setenv() {
setenv("CLASSPATH", "/system/framework/pm.jar", 1);
}
void late_start(int client) {
LOGI("** late_start service mode running\n");
// ack