Pass last parameter to send_intent() as pointer to the action name

git-core · git-core · commit 73e06ac2df0f · 2012-01-29T21:37:51.000+04:00
diff --git a/activity.cpp b/activity.cpp
@@ -44,7 +44,8 @@ static const int VAL_INTEGER = 1;
 
 static const int START_SUCCESS = 0;
 
-int send_intent(struct su_context *ctx, const char *socket_path, int allow, int type)
+int send_intent(struct su_context *ctx,
+                const char *socket_path, int allow, const char *action)
 {
     sp<IServiceManager> sm = defaultServiceManager();
     sp<IBinder> am = sm->checkService(String16("activity"));
@@ -56,11 +57,7 @@ int send_intent(struct su_context *ctx, const char *socket_path, int allow, int
     data.writeStrongBinder(NULL); /* caller */
 
     /* intent */
-    if (type == 0) {
-        data.writeString16(String16("com.noshufou.android.su.REQUEST")); /* action */
-    } else {
-        data.writeString16(String16("com.noshufou.android.su.RESULT")); /* action */
-    }
+    data.writeString16(String16(action)); /* action */
     data.writeInt32(NULL_TYPE_ID); /* Uri - data */
     data.writeString16(NULL, 0); /* type */
     data.writeInt32(0); /* flags */
diff --git a/su.c b/su.c
@@ -274,7 +274,7 @@ static void deny(struct su_context *ctx)
 {
     char *cmd = get_command(&ctx->to);
 
-    send_intent(ctx, "", 0, 1);
+    send_intent(ctx, "", 0, ACTION_RESULT);
     LOGW("request rejected (%u->%u %s)", ctx->from.uid, ctx->to.uid, cmd);
     fprintf(stderr, "%s\n", strerror(EACCES));
     exit(EXIT_FAILURE);
@@ -286,7 +286,7 @@ static void allow(struct su_context *ctx)
     int argc, err;
 
     umask(ctx->umask);
-    send_intent(ctx, "", 1, 1);
+    send_intent(ctx, "", 1, ACTION_RESULT);
 
     arg0 = strrchr (ctx->to.shell, '/');
     arg0 = (arg0) ? arg0 + 1 : ctx->to.shell;
@@ -487,7 +487,7 @@ int main(int argc, char *argv[])
     signal(SIGABRT, cleanup_signal);
     atexit(cleanup);
 
-    if (send_intent(&ctx, socket_path, -1, 0) < 0) {
+    if (send_intent(&ctx, socket_path, -1, ACTION_REQUEST) < 0) {
         deny(&ctx);
     }
 
diff --git a/su.h b/su.h
@@ -25,6 +25,10 @@
 #define REQUESTOR_DATABASES_PATH REQUESTOR_DATA_PATH "/databases"
 #define REQUESTOR_DATABASE_PATH REQUESTOR_DATABASES_PATH "/permissions.sqlite"
 
+/* intent actions */
+#define ACTION_REQUEST REQUESTOR ".REQUEST"
+#define ACTION_RESULT  REQUESTOR ".RESULT"
+
 #define DEFAULT_SHELL "/system/bin/sh"
 
 #ifdef SU_LEGACY_BUILD
@@ -71,7 +75,8 @@ enum {
 
 extern int database_check(struct su_context *ctx);
 
-extern int send_intent(struct su_context *ctx, const char *socket_path, int allow, int type);
+extern int send_intent(struct su_context *ctx,
+                       const char *socket_path, int allow, const char *action);
 
 static inline char *get_command(struct su_request *to)
 {
