Loop for every for logging

jni/daemon/log_monitor.c

@@ -9,6 +9,7 @@
 #include <limits.h>
 #include <pthread.h>
 #include <unistd.h>
+#include <sys/wait.h>
 
 #include "magisk.h"
 #include "utils.h"
@@ -23,17 +24,26 @@ static void *logger_thread(void *args) {
 	FILE *logfile = xfdopen(xopen(LOGFILE, O_WRONLY | O_CREAT | O_CLOEXEC | O_TRUNC, 0644), "w");
 	// Disable buffering
 	setbuf(logfile, NULL);
+	int fd, log_pid;
+
+	while (1) {
 		// Start logcat
 		char *const command[] = { "logcat", "-s", "Magisk", "-v", "time", NULL };
-	int fd;
+		log_pid = run_command(&fd, "/system/bin/logcat", command);
-	run_command(&fd, "/system/bin/logcat", command);
 		while (fdgets(buffer, PATH_MAX, fd)) {
 			fprintf(logfile, "%s", buffer);
 		}
-	// Should never be here, but well...
+
-	free(buffer);
+		// For some reason it went here, clear buffer and restart
 		close(fd);
+		kill(log_pid, SIGTERM);
+		waitpid(log_pid, NULL, 0);
+		system("logcat -c");
+	}
+
+	// Should never be here, but well...
 	fclose(logfile);
+	free(buffer);
 	return NULL;
 }
 

jni/magisk.h

@@ -32,6 +32,7 @@
 #define MOUNTPOINT      "/magisk"
 #define COREDIR         MOUNTPOINT "/.core"
 #define HOSTSFILE       COREDIR "/hosts"
+#define HIDELIST        COREDIR "/hidelist"
 #define MAINIMG         "/data/magisk.img"
 #define DATABIN         "/data/magisk"
 #define MANAGERAPK      DATABIN "/magisk.apk"

jni/magiskhide/hide_daemon.c

@@ -113,7 +113,7 @@ int hide_daemon() {
 
 		// Unmount loop mounts
 		vec_for_each_r(&mount_list, line) {
-			if (strstr(line, "/dev/block/loop") && !strstr(line, DUMMYPATH)) {
+			if (strstr(line, "/dev/block/loop") && !strstr(line, DUMMDIR)) {
 				sscanf(line, "%*s %512s", buffer);
 				lazy_unmount(buffer);
 			}

jni/magiskhide/magiskhide.h

@@ -3,9 +3,6 @@
 
 #include <pthread.h>
 
-#define HIDELIST		"/magisk/.core/magiskhide/hidelist"
-#define DUMMYPATH		"/dev/magisk/dummy"
-
 // Kill process
 void kill_proc(int pid);
 

jni/magiskhide/proc_monitor.c

@@ -101,8 +101,11 @@ void proc_monitor() {
 		break;
 	}
 
-	// Monitor am_proc_start
+	while (1) {
+		// Clear previous buffer
 		system("logcat -b events -c");
+
+		// Monitor am_proc_start
 		char *const command[] = { "logcat", "-b", "events", "-v", "raw", "-s", "am_proc_start", NULL };
 		log_pid = run_command(&log_fd, "/system/bin/logcat", command);
 
@@ -170,6 +173,10 @@ void proc_monitor() {
 			}
 		}
 
-	// Should never be here
+		// For some reason it went here, restart logging
-	quit_pthread(SIGUSR1);
+		kill(log_pid, SIGTERM);
+		waitpid(log_pid, NULL, 0);
+		close(log_fd);
+		log_pid = 0;
+	}
 }

jni/utils/misc.c

@@ -67,7 +67,7 @@ int file_to_vector(const char* filename, struct vector *v) {
 	size_t len = 0;
 	ssize_t read;
 
-	FILE *fp = xfopen(filename, "r");
+	FILE *fp = fopen(filename, "r");
 	if (fp == NULL)
 		return 1;
 
@@ -105,16 +105,16 @@ int isNum(const char *s) {
 
 /* Read a whole line from file descriptor */
 ssize_t fdgets(char *buf, const size_t size, int fd) {
-	ssize_t read = 0;
+	ssize_t len = 0;
 	buf[0] = '\0';
-	while (xread(fd, buf + read, 1) && read < size - 1) {
+	while (read(fd, buf + len, 1) >= 0 && len < size - 1) {
-		if (buf[read] == '\0' || buf[read++] == '\n') {
+		if (buf[len] == '\0' || buf[len++] == '\n') {
-			buf[read] = '\0';
+			buf[len] = '\0';
 			break;
 		}
 	}
 	buf[size - 1] = '\0';
-	return read;
+	return len;
 }
 
 /* Call func for each process */