From 7e2ba41c649bef8a182346ae107d04dd5b09e422 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 22 Apr 2018 02:16:16 +0800
Subject: [PATCH] Refactoring

---
 db.c        | 2 +-
 su.h        | 1 -
 su_daemon.c | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/db.c b/db.c
index 51d1c3db7..cc4d42589 100644
--- a/db.c
+++ b/db.c
@@ -87,7 +87,7 @@ void database_check(struct su_context *ctx) {
 	strcpy(ctx->info->pkg_name, "???");  /* bad string so it doesn't exist */
 
 	// Open database
-	ret = sqlite3_open_v2(DATABASE_PATH, &db, SQLITE_OPEN_READONLY, NULL);
+	ret = sqlite3_open_v2(MAGISKDB, &db, SQLITE_OPEN_READONLY, NULL);
 	if (ret) {
 		LOGE("sqlite3 open failure: %s\n", sqlite3_errstr(ret));
 		sqlite3_close(db);
diff --git a/su.h b/su.h
index b61386d89..89b6c93dc 100644
--- a/su.h
+++ b/su.h
@@ -41,7 +41,6 @@
 #define REQUESTOR_PREFIX JAVA_PACKAGE_NAME ".superuser"
 
 #define DEFAULT_SHELL "/system/bin/sh"
-#define DATABASE_PATH "/data/adb/magisk.db"
 
 typedef enum {
 	QUERY = 0,
diff --git a/su_daemon.c b/su_daemon.c
index b3adf3e37..4955df71a 100644
--- a/su_daemon.c
+++ b/su_daemon.c
@@ -337,7 +337,7 @@ int su_client_main(int argc, char *argv[]) {
 	int ptmx, socketfd;
 
 	// Connect to client
-	socketfd = connect_daemon();
+	socketfd = connect_daemon(0);
 
 	// Tell the daemon we are su
 	write_int(socketfd, SUPERUSER);