MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

MagiskHide small tweak

Browse Source
This commit is contained in:
topjohnwu 2016-11-07 23:57:21 +08:00
parent cfa0d8b7c0
commit 3068738a70
4 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jni/magiskhide.c
View File

@ -12,6 +12,9 @@
#include <sys/inotify.h> #include <sys/inotify.h>
#include <sys/wait.h> #include <sys/wait.h>
#define LOGFILE "/cache/magisk.log"
#define HIDELIST "/magisk/.core/magiskhide/hidelist"
FILE *logfile; FILE *logfile;
int i, list_size; int i, list_size;
char **hide_list = NULL; char **hide_list = NULL;
@ -111,7 +114,7 @@ void update_list(const char *listpath) {
hide_list = file_to_str_arr(hide_fp, &list_size); hide_list = file_to_str_arr(hide_fp, &list_size);
pthread_mutex_unlock(&mutex); pthread_mutex_unlock(&mutex);
fclose(hide_fp); fclose(hide_fp);
fprintf(logfile, "MagiskHide: Update process/package list:\n"); if (list_size) fprintf(logfile, "MagiskHide: Update process/package list:\n");
for(i = 0; i < list_size; i++) for(i = 0; i < list_size; i++)
fprintf(logfile, "MagiskHide: %s\n", hide_list[i]); fprintf(logfile, "MagiskHide: %s\n", hide_list[i]);
} }
@ -129,18 +132,22 @@ void *monitor_list(void *listpath) {
// Initial load // Initial load
update_list((char*) listpath); update_list((char*) listpath);
int inotifyFd; int inotifyFd = -1;
char buffer[512]; char buffer[512];
inotifyFd = inotify_init();
if (inotifyFd == -1)
exit(1);
if (inotify_add_watch(inotifyFd, (char*) listpath, IN_ATTRIB | IN_MODIFY) == -1)
exit(1);
while(1) { while(1) {
if (read(inotifyFd, buffer, 512) == -1) if (inotifyFd == -1 || read(inotifyFd, buffer, 512) == -1) {
exit(1); close(inotifyFd);
inotifyFd = inotify_init();
if (inotifyFd == -1) {
fprintf(logfile, "MagiskHide: Unable to watch %s\n", listpath);
exit(1);
}
if (inotify_add_watch(inotifyFd, (char*) listpath, IN_MODIFY) == -1) {
fprintf(logfile, "MagiskHide: Unable to watch %s\n", listpath);
exit(1);
}
}
update_list((char*) listpath); update_list((char*) listpath);
} }
@ -162,13 +169,13 @@ int main(int argc, char **argv, char **envp) {
close(STDOUT_FILENO); close(STDOUT_FILENO);
close(STDERR_FILENO); close(STDERR_FILENO);
logfile = fopen("/cache/magisk.log", "a+"); logfile = fopen(LOGFILE, "a+");
setbuf(logfile, NULL); setbuf(logfile, NULL);
pthread_t list_monitor; pthread_t list_monitor;
pthread_mutex_init(&mutex, NULL); pthread_mutex_init(&mutex, NULL);
pthread_create(&list_monitor, NULL, monitor_list, "/magisk/.core/magiskhide/hidelist"); pthread_create(&list_monitor, NULL, monitor_list, HIDELIST);
char buffer[512]; char buffer[512];
FILE *p = popen("while true; do logcat -b events -v raw -s am_proc_start; sleep 1; done", "r"); FILE *p = popen("while true; do logcat -b events -v raw -s am_proc_start; sleep 1; done", "r");

3
scripts/magic_mask.sh
View File

@ -234,6 +234,9 @@ case $1 in
# log_print "** Magisk post-fs mode running..." # log_print "** Magisk post-fs mode running..."
# Cleanup previous stuffs...
rm -rf /cache/magisk /cache/magisk_merge /cache/magiskhide.log
unblock unblock
;; ;;

2
zip_static/common/magiskhide/add
View File

@ -5,5 +5,7 @@ HIDELIST=/magisk/.core/magiskhide/hidelist
if [ ! -z "$1" ]; then if [ ! -z "$1" ]; then
if [ $(grep -c "^$1$" $HIDELIST) -eq "0" ]; then if [ $(grep -c "^$1$" $HIDELIST) -eq "0" ]; then
echo "$1" >> $HIDELIST echo "$1" >> $HIDELIST
set `/data/busybox/ps -o pid,args | grep "$1" | grep -v "grep"`
kill "$1"
fi fi
fi fi

2
zip_static/common/magiskhide/rm
View File

@ -3,7 +3,7 @@
HIDELIST=/magisk/.core/magiskhide/hidelist HIDELIST=/magisk/.core/magiskhide/hidelist
if [ ! -z "$1" ]; then if [ ! -z "$1" ]; then
mv $HIDELIST $HIDELIST.tmp cp -af $HIDELIST $HIDELIST.tmp
cat $HIDELIST.tmp | grep -v "^$1$" > $HIDELIST cat $HIDELIST.tmp | grep -v "^$1$" > $HIDELIST
rm -f $HIDELIST.tmp rm -f $HIDELIST.tmp
set `/data/busybox/ps -o pid,args | grep "$1" | grep -v "grep"` set `/data/busybox/ps -o pid,args | grep "$1" | grep -v "grep"`