MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Change flags

Browse Source
This commit is contained in:
topjohnwu 2017-04-18 21:31:12 +08:00
parent e9afc15719
commit 102a7f8723
5 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jni/Android.mk
View File

@ -44,7 +44,7 @@ LOCAL_SRC_FILES := \
su/su_client.c \ su/su_client.c \
su/su_socket.c su/su_socket.c
LOCAL_CFLAGS := -Wno-implicit-exception-spec-mismatch -DDEBUG LOCAL_CFLAGS := -Wno-implicit-exception-spec-mismatch
LOCAL_LDLIBS := -llog LOCAL_LDLIBS := -llog
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

4
jni/daemon/daemon.c
View File

@ -44,11 +44,11 @@ static void request_handler(int client) {
su_daemon_receiver(client); su_daemon_receiver(client);
break; break;
case CHECK_VERSION: case CHECK_VERSION:
write_string(client, VERSION_STR); write_string(client, MAGISK_VER_STR);
close(client); close(client);
break; break;
case CHECK_VERSION_CODE: case CHECK_VERSION_CODE:
write_int(client, VERSION_CODE); write_int(client, MAGISK_VER_CODE);
close(client); close(client);
break; break;
case POST_FS: case POST_FS:

11
jni/magisk.h
View File

@ -10,10 +10,13 @@
#include <pthread.h> #include <pthread.h>
#include <android/log.h> #include <android/log.h>
#ifndef MAGISK_VER_CODE
#define VERSION_CODE 130 #define MAGISK_VER_CODE 99999
#define VERSION 13.0 #endif
#define VERSION_STR xstr(VERSION) ":MAGISK" #ifndef MAGISK_VERSION
#define MAGISK_VERSION VER_DEBUG
#endif
#define MAGISK_VER_STR xstr(MAGISK_VERSION) ":MAGISK"
#define str(a) #a #define str(a) #a
#define xstr(a) str(a) #define xstr(a) str(a)

2
jni/main.c
View File

@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
if (strcmp(arg, "magisk") == 0) { if (strcmp(arg, "magisk") == 0) {
if (argc < 2) usage(); if (argc < 2) usage();
if (strcmp(argv[1], "-v") == 0) { if (strcmp(argv[1], "-v") == 0) {
printf("Client: %s\n", VERSION_STR); printf("Client: %s\n", MAGISK_VER_STR);
int fd = connect_daemon(); int fd = connect_daemon();
write_int(fd, CHECK_VERSION); write_int(fd, CHECK_VERSION);
char *v = read_string(fd); char *v = read_string(fd);

2
jni/su

@ -1 +1 @@
Subproject commit 4035d5b0379ddb69ce037c54587bd222710d0396 Subproject commit b499ac8abacc9d009d110146e2f681a9b0a66f19