From 1046dd5eda244d92dedcfce7e02fb4f19f4ad01b Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sat, 27 Oct 2018 18:34:38 -0400
Subject: [PATCH] Default to cmdline logging

---
 native/jni/img.c                       | 1 -
 native/jni/magiskhide/magiskhide.c     | 1 -
 native/jni/magiskpolicy/magiskpolicy.c | 1 -
 native/jni/main.c                      | 1 +
 native/jni/resetprop/resetprop.c       | 1 -
 5 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/native/jni/img.c b/native/jni/img.c
index ff044e58d..96853b23c 100644
--- a/native/jni/img.c
+++ b/native/jni/img.c
@@ -100,7 +100,6 @@ static void usage() {
 }
 
 int imgtool_main(int argc, char *argv[]) {
-	cmdline_logging();
 	if (argc < 2)
 		usage();
 	if (strcmp(argv[1], "create") == 0) {
diff --git a/native/jni/magiskhide/magiskhide.c b/native/jni/magiskhide/magiskhide.c
index 4eee1bdf8..3a646e688 100644
--- a/native/jni/magiskhide/magiskhide.c
+++ b/native/jni/magiskhide/magiskhide.c
@@ -114,7 +114,6 @@ void stop_magiskhide(int client) {
 }
 
 int magiskhide_main(int argc, char *argv[]) {
-	cmdline_logging();
 	if (argc < 2) {
 		usage(argv[0]);
 	}
diff --git a/native/jni/magiskpolicy/magiskpolicy.c b/native/jni/magiskpolicy/magiskpolicy.c
index 783cf492b..0d489d47b 100644
--- a/native/jni/magiskpolicy/magiskpolicy.c
+++ b/native/jni/magiskpolicy/magiskpolicy.c
@@ -391,7 +391,6 @@ static void syntax_error_msg() {
 }
 
 int magiskpolicy_main(int argc, char *argv[]) {
-	cmdline_logging();
 	char *outfile = NULL, *tok, *saveptr;
 	int magisk = 0;
 	struct vector rules;
diff --git a/native/jni/main.c b/native/jni/main.c
index f73189f63..96018e31a 100644
--- a/native/jni/main.c
+++ b/native/jni/main.c
@@ -28,6 +28,7 @@ int main(int argc, char *argv[]) {
 	umask(0);
 	argv0 = argv[0];
 	dload_selinux();
+	cmdline_logging();
 
 	if (strcmp(basename(argv0), "magisk.bin") == 0 ||
 			(strcmp(basename(argv[0]), "magisk") == 0
diff --git a/native/jni/resetprop/resetprop.c b/native/jni/resetprop/resetprop.c
index a8e26ad21..02a7bc634 100644
--- a/native/jni/resetprop/resetprop.c
+++ b/native/jni/resetprop/resetprop.c
@@ -297,7 +297,6 @@ static int verbose_logging(const char *fmt, va_list ap) {
 }
 
 int resetprop_main(int argc, char *argv[]) {
-	cmdline_logging();
 	log_cb.d = verbose_logging;
 	
 	int trigger = 1, persist = 0;