TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-10-15 19:50:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Build with -Wall

Browse Source
This commit is contained in:
topjohnwu
2019-04-29 21:26:43 -04:00
parent 8d68ebb074
commit 00a9f18a1e
8 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
native/jni/su/connect.cpp
View File

@@ -17,7 +17,7 @@
// 0x18000020 = FLAG_ACTIVITY_NEW_TASK|FLAG_ACTIVITY_MULTIPLE_TASK|FLAG_INCLUDE_STOPPED_PACKAGES
static inline const char *get_command(const struct su_request *to) {
static inline const char *get_command(const su_request *to) {
if (to->command[0])
return to->command;
if (to->shell[0])
@@ -25,21 +25,21 @@ static inline const char *get_command(const struct su_request *to) {
return DEFAULT_SHELL;
}
static inline void get_user(char *user, struct su_info *info) {
static inline void get_user(char *user, su_info *info) {
sprintf(user, "%d",
info->cfg[SU_MULTIUSER_MODE] == MULTIUSER_MODE_USER
? info->uid / 100000
: 0);
}
static inline void get_uid(char *uid, struct su_info *info) {
static inline void get_uid(char *uid, su_info *info) {
sprintf(uid, "%d",
info->cfg[SU_MULTIUSER_MODE] == MULTIUSER_MODE_OWNER_MANAGED
? info->uid % 100000
: info->uid);
}
static void silent_run(const char **args, struct su_info *info) {
static void silent_run(const char **args, su_info *info) {
char component[128];
sprintf(component, "%s/a.m", info->str[SU_MANAGER].data());
char user[8];
@@ -62,7 +62,7 @@ static void silent_run(const char **args, struct su_info *info) {
exec_command(exec);
}
void app_log(struct su_context *ctx) {
void app_log(su_context *ctx) {
char fromUid[8];
get_uid(fromUid, ctx->info);
@@ -88,7 +88,7 @@ void app_log(struct su_context *ctx) {
silent_run(cmd, ctx->info);
}
void app_notify(struct su_context *ctx) {
void app_notify(su_context *ctx) {
char fromUid[8];
get_uid(fromUid, ctx->info);
@@ -104,7 +104,7 @@ void app_notify(struct su_context *ctx) {
silent_run(cmd, ctx->info);
}
void app_connect(const char *socket, struct su_info *info) {
void app_connect(const char *socket, su_info *info) {
const char *cmd[] = {
START_ACTIVITY, "request",
"--es", "socket", socket,
@@ -113,7 +113,7 @@ void app_connect(const char *socket, struct su_info *info) {
silent_run(cmd, info);
}
void socket_send_request(int fd, struct su_info *info) {
void socket_send_request(int fd, su_info *info) {
write_key_token(fd, "uid", info->uid);
write_string_be(fd, "eof");
}

1
native/jni/su/pts.cpp
View File

@@ -83,7 +83,6 @@ static void pump_async(int input, int output) {
*/
int pts_open(char *slave_name, size_t slave_name_size) {
int fdm;
char sn_tmp[256];
// Open master ptmx device
fdm = open("/dev/ptmx", O_RDWR);

12
native/jni/su/su.h
View File

@@ -60,16 +60,16 @@ struct su_request : public su_req_base {
} __attribute__((packed));
struct su_context {
struct su_info *info;
struct su_request req;
su_info *info;
su_request req;
pid_t pid;
};
// connect.c
void app_log(struct su_context *ctx);
void app_notify(struct su_context *ctx);
void app_connect(const char *socket, struct su_info *info);
void socket_send_request(int fd, struct su_info *info);
void app_log(su_context *ctx);
void app_notify(su_context *ctx);
void app_connect(const char *socket, su_info *info);
void socket_send_request(int fd, su_info *info);
#endif

8
native/jni/su/su_daemon.cpp
View File

@@ -26,8 +26,8 @@ static pthread_mutex_t cache_lock = PTHREAD_MUTEX_INITIALIZER;
static su_info *cache;
su_info::su_info(unsigned uid) :
uid(uid), access(DEFAULT_SU_ACCESS), _lock(PTHREAD_MUTEX_INITIALIZER),
count(0), ref(0), timestamp(0), mgr_st({}) {}
uid(uid), count(0), access(DEFAULT_SU_ACCESS), mgr_st({}), ref(0),
timestamp(0), _lock(PTHREAD_MUTEX_INITIALIZER) {}
su_info::~su_info() {
pthread_mutex_destroy(&_lock);
@@ -90,7 +90,7 @@ static void database_check(su_info *info) {
validate_manager(info->str[SU_MANAGER], uid / 100000, &info->mgr_st);
}
static struct su_info *get_su_info(unsigned uid) {
static su_info *get_su_info(unsigned uid) {
su_info *info = nullptr;
// Get from cache or new instance
@@ -235,7 +235,7 @@ void su_daemon_handler(int client, struct ucred *credential) {
// Abort upon any error occurred
log_cb.ex = exit;
struct su_context ctx = {
su_context ctx = {
.info = info,
.pid = credential->pid
};