TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-30 13:35:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Swap buffer to fix module scripts

Browse Source
This commit is contained in:
topjohnwu 2017-08-03 18:07:34 +08:00
parent eae611c54d
commit 3b68905037
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jni/daemon/bootstages.c
View File

@ -134,10 +134,8 @@ static void trim_img(const char *img) {
***********/ ***********/
static void bb_path() { static void bb_path() {
char *path = strdup(getenv("PATH")); snprintf(buf, PATH_MAX, "%s:%s", BBPATH, getenv("PATH"));
snprintf(buf, PATH_MAX, "%s:%s", BBPATH, path);
setenv("PATH", buf, 1); setenv("PATH", buf, 1);
free(path);
} }
static void exec_common_script(const char* stage) { static void exec_common_script(const char* stage) {
@ -167,12 +165,12 @@ static void exec_common_script(const char* stage) {
static void exec_module_script(const char* stage) { static void exec_module_script(const char* stage) {
char *module; char *module;
vec_for_each(&module_list, module) { vec_for_each(&module_list, module) {
snprintf(buf, PATH_MAX, "%s/%s/%s.sh", MOUNTPOINT, module, stage); snprintf(buf2, PATH_MAX, "%s/%s/%s.sh", MOUNTPOINT, module, stage);
snprintf(buf2, PATH_MAX, "%s/%s/disable", MOUNTPOINT, module); snprintf(buf, PATH_MAX, "%s/%s/disable", MOUNTPOINT, module);
if (access(buf, F_OK) == -1 || access(buf2, F_OK) == 0) if (access(buf2, F_OK) == -1 || access(buf, F_OK) == 0)
continue; continue;
LOGI("%s: exec [%s.sh]\n", module, stage); LOGI("%s: exec [%s.sh]\n", module, stage);
char *const command[] = { "sh", buf, NULL }; char *const command[] = { "sh", buf2, NULL };
int pid = run_command(0, NULL, bb_path, "/system/bin/sh", command); int pid = run_command(0, NULL, bb_path, "/system/bin/sh", command);
if (pid != -1) if (pid != -1)
waitpid(pid, NULL, 0); waitpid(pid, NULL, 0);