magic-coder
diff --git a/‎activity.cpp
Lines changed: 7 additions & 7 deletions b/‎activity.cpp
Lines changed: 7 additions & 7 deletions
diff --git a/‎db.c
Lines changed: 4 additions & 4 deletions b/‎db.c
Lines changed: 4 additions & 4 deletions
@@ -46,7 +46,7 @@ static const int VAL_INTEGER = 1;
 
 static const int START_SUCCESS = 0;
 
-int send_intent(struct su_initiator *from, struct su_request *to, const char *socket_path, int allow, int type)
+int send_intent(struct su_context *ctx, const char *socket_path, int allow, int type)
 {
     char sdk_version_prop[PROPERTY_VALUE_MAX] = "0";
     property_get("ro.build.version.sdk", sdk_version_prop, "0");
@@ -95,25 +95,25 @@ int send_intent(struct su_initiator *from, struct su_request *to, const char *so
             data.writeInt32(VAL_STRING);
             data.writeString16(String16("caller_uid"));
             data.writeInt32(VAL_INTEGER);
-            data.writeInt32(from->uid);
+            data.writeInt32(ctx->from.uid);
 
             data.writeInt32(VAL_STRING);
             data.writeString16(String16("caller_bin"));
             data.writeInt32(VAL_STRING);
-            data.writeString16(String16(from->bin));
+            data.writeString16(String16(ctx->from.bin));
 
             data.writeInt32(VAL_STRING);
             data.writeString16(String16("desired_uid"));
             data.writeInt32(VAL_INTEGER);
-            data.writeInt32(to->uid);
+            data.writeInt32(ctx->to.uid);
 
             data.writeInt32(VAL_STRING);
             data.writeString16(String16("desired_cmd"));
             data.writeInt32(VAL_STRING);
-            if (to->command)
-                data.writeString16(String16(to->command));
+            if (ctx->to.command)
+                data.writeString16(String16(ctx->to.command));
             else
-                data.writeString16(String16(to->shell));
+                data.writeString16(String16(ctx->to.shell));
 
             data.writeInt32(VAL_STRING);
             data.writeString16(String16("socket"));
 
@@ -41,7 +41,7 @@ static sqlite3 *db_init()
     return db;
 }
 
-static int db_check(sqlite3 *db, struct su_initiator *from, struct su_request *to)
+static int db_check(sqlite3 *db, struct su_context *ctx)
 {
     char sql[4096];
     char *zErrmsg;
@@ -52,7 +52,7 @@ static int db_check(sqlite3 *db, struct su_initiator *from, struct su_request *t
     sqlite3_snprintf(
         sizeof(sql), sql,
         "SELECT _id,name,allow FROM apps WHERE uid=%u AND exec_uid=%u AND exec_cmd='%q';",
-        (unsigned)from->uid, to->uid, (to->command) ? to->command : to->shell
+        ctx->from.uid, ctx->to.uid, (ctx->to.command) ? ctx->to.command : ctx->to.shell
     );
 
     if (strlen(sql) >= sizeof(sql)-1)
@@ -86,7 +86,7 @@ static int db_check(sqlite3 *db, struct su_initiator *from, struct su_request *t
     return allow;
 }
 
-int database_check(struct su_initiator *from, struct su_request *to)
+int database_check(struct su_context *ctx)
 {
     sqlite3 *db;
     int dballow;
@@ -101,7 +101,7 @@ int database_check(struct su_initiator *from, struct su_request *to)
     }
 
     LOGE("sudb - Database opened");
-    dballow = db_check(db, from, to);
+    dballow = db_check(db, ctx);
     // Close the database, we're done with it. If it stays open, it will cause problems
     sqlite3_close(db);
     LOGE("sudb - Database closed");
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ static sqlite3 *db_init()`
`41`	`41`	`return db;`
`42`	`42`	`}`
`43`	`43`
`44`		`-static int db_check(sqlite3 db, struct su_initiator from, struct su_request *to)`
	`44`	`+static int db_check(sqlite3 db, struct su_context ctx)`
`45`	`45`	`{`
`46`	`46`	`char sql[4096];`
`47`	`47`	`char *zErrmsg;`
`@@ -52,7 +52,7 @@ static int db_check(sqlite3 db, struct su_initiator from, struct su_request *t`
`52`	`52`	`sqlite3_snprintf(`
`53`	`53`	`sizeof(sql), sql,`
`54`	`54`	`"SELECT _id,name,allow FROM apps WHERE uid=%u AND exec_uid=%u AND exec_cmd='%q';",`
`55`		`- (unsigned)from->uid, to->uid, (to->command) ? to->command : to->shell`
	`55`	`+ ctx->from.uid, ctx->to.uid, (ctx->to.command) ? ctx->to.command : ctx->to.shell`
`56`	`56`	`);`
`57`	`57`
`58`	`58`	`if (strlen(sql) >= sizeof(sql)-1)`
`@@ -86,7 +86,7 @@ static int db_check(sqlite3 db, struct su_initiator from, struct su_request *t`
`86`	`86`	`return allow;`
`87`	`87`	`}`
`88`	`88`
`89`		`-int database_check(struct su_initiator from, struct su_request to)`
	`89`	`+int database_check(struct su_context *ctx)`
`90`	`90`	`{`
`91`	`91`	`sqlite3 *db;`
`92`	`92`	`int dballow;`
`@@ -101,7 +101,7 @@ int database_check(struct su_initiator from, struct su_request to)`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`LOGE("sudb - Database opened");`
`104`		`- dballow = db_check(db, from, to);`
	`104`	`+ dballow = db_check(db, ctx);`
`105`	`105`	`// Close the database, we're done with it. If it stays open, it will cause problems`
`106`	`106`	`sqlite3_close(db);`
`107`	`107`	`LOGE("sudb - Database closed");`