TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2024-11-24 02:25:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

scripts: fix addon.d again by ensuring all arguments get passed

Browse Source 
- /proc/$$/cmdline is \0 terminated argument strings except for the last argument which has no terminus, so the last argument was being dropped by `while read` which requires input to be \n terminated
- switch to a for loop, which will use the \n delimiter but also read the last argument; all arguments are still protected by quoting
- clean up potentially breaking recovery env since $OLD_PATH no longer exists
This commit is contained in:
osm0sis 2020-03-20 08:02:48 -03:00 committed by John Wu
parent f7142e69b6
commit 84ecba4629
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
scripts/util_functions.sh
View File

@ -107,7 +107,7 @@ ensure_bb() {
# Run in busybox environment to ensure consistent results # Run in busybox environment to ensure consistent results
# /proc/<pid>/cmdline shall be <interpreter> <script> <arguments...> # /proc/<pid>/cmdline shall be <interpreter> <script> <arguments...>
local cmds=$($bb sh -o standalone -c " local cmds=$($bb sh -o standalone -c "
tr '\0' '\n' < /proc/$$/cmdline | (while read -r arg; do for arg in \$(tr '\0' '\n' < /proc/$$/cmdline); do
if [ -z \"\$cmds\" ]; then if [ -z \"\$cmds\" ]; then
# Skip the first argument as we want to change the interpreter # Skip the first argument as we want to change the interpreter
cmds=\"sh -o standalone\" cmds=\"sh -o standalone\"
@ -115,7 +115,7 @@ ensure_bb() {
cmds=\"\$cmds '\$arg'\" cmds=\"\$cmds '\$arg'\"
fi fi
done done
echo \$cmds)") echo \$cmds")
# Re-exec our script # Re-exec our script
echo $cmds | $bb xargs $bb echo $cmds | $bb xargs $bb
@ -151,7 +151,6 @@ recovery_cleanup() {
fi fi
done done
umount -l /dev/random) 2>/dev/null umount -l /dev/random) 2>/dev/null
export PATH=$OLD_PATH
[ -z $OLD_LD_LIB ] || export LD_LIBRARY_PATH=$OLD_LD_LIB [ -z $OLD_LD_LIB ] || export LD_LIBRARY_PATH=$OLD_LD_LIB
[ -z $OLD_LD_PRE ] || export LD_PRELOAD=$OLD_LD_PRE [ -z $OLD_LD_PRE ] || export LD_PRELOAD=$OLD_LD_PRE
[ -z $OLD_LD_CFG ] || export LD_CONFIG_FILE=$OLD_LD_CFG [ -z $OLD_LD_CFG ] || export LD_CONFIG_FILE=$OLD_LD_CFG