Move all code that deals with database in db.c

git-core · git-core · commit 73a49647c561 · 2012-01-05T18:44:14.000+04:00
diff --git a/db.c b/db.c
@@ -25,7 +25,7 @@
 
 // { int* pint; pint=(int*)data; ++(*pint); }
 
-sqlite3 *database_init()
+static sqlite3 *db_init()
 {
     sqlite3 *db;
     int rc;
@@ -41,7 +41,7 @@ sqlite3 *database_init()
     return db;
 }
 
-int database_check(sqlite3 *db, struct su_initiator *from, struct su_request *to)
+static int db_check(sqlite3 *db, struct su_initiator *from, struct su_request *to)
 {
     char sql[4096];
     char *zErrmsg;
@@ -85,3 +85,25 @@ int database_check(sqlite3 *db, struct su_initiator *from, struct su_request *to
     
     return allow;
 }
+
+int database_check(struct su_initiator *from, struct su_request *to)
+{
+    sqlite3 *db;
+    int dballow;
+
+    LOGE("sudb - Opening database");
+    db = db_init();
+    if (!db) {
+        LOGE("sudb - Could not open database, prompt user");
+        // if the database could not be opened, we can assume we need to
+        // prompt the user
+        return DB_INTERACTIVE;
+    }
+
+    LOGE("sudb - Database opened");
+    dballow = db_check(db, from, to);
+    // Close the database, we're done with it. If it stays open, it will cause problems
+    sqlite3_close(db);
+    LOGE("sudb - Database closed");
+    return dballow;
+}
diff --git a/su.c b/su.c
@@ -39,18 +39,12 @@
 #include <private/android_filesystem_config.h>
 #include <cutils/log.h>
 
-#include <sqlite3.h>
-
 #include "su.h"
 
 //extern char* _mktemp(char*); /* mktemp doesn't link right.  Don't ask me why. */
 
-extern sqlite3 *database_init();
-extern int database_check(sqlite3*, struct su_initiator*, struct su_request*);
-
 /* Still lazt, will fix this */
 static char *socket_path = NULL;
-static sqlite3 *db = NULL;
 
 static struct su_initiator su_from = {
     .pid = -1,
@@ -137,7 +131,6 @@ static void socket_cleanup(void)
 static void cleanup(void)
 {
     socket_cleanup();
-    if (db) sqlite3_close(db);
 }
 
 static void cleanup_signal(int sig)
@@ -396,23 +389,7 @@ int main(int argc, char *argv[])
     setegid(st.st_gid);
     seteuid(st.st_uid);
 
-    LOGE("sudb - Opening database");
-    db = database_init();
-    if (!db) {
-        LOGE("sudb - Could not open database, prompt user");
-        // if the database could not be opened, we can assume we need to
-        // prompt the user
-        dballow = DB_INTERACTIVE;
-    } else {
-        LOGE("sudb - Database opened");
-        dballow = database_check(db, &su_from, &su_to);
-        // Close the database, we're done with it. If it stays open,
-        // it will cause problems
-        sqlite3_close(db);
-        db = NULL;
-        LOGE("sudb - Database closed");
-    }
-
+    dballow = database_check(&su_from, &su_to);
     switch (dballow) {
         case DB_DENY: deny();
         case DB_ALLOW: allow(shell, orig_umask);
diff --git a/su.h b/su.h
@@ -53,6 +53,8 @@ enum {
     DB_ALLOW
 };
 
+extern int database_check(struct su_initiator*, struct su_request*);
+
 extern int send_intent(struct su_initiator *from, struct su_request *to, const char *socket_path, int allow, int type);
 
 #if 0
