Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
M
Magisk
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
Magisk
Commits
102a7f87
Commit
102a7f87
authored
Apr 18, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change flags
parent
e9afc157
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
9 deletions
+12
-9
Android.mk
jni/Android.mk
+1
-1
daemon.c
jni/daemon/daemon.c
+2
-2
magisk.h
jni/magisk.h
+7
-4
main.c
jni/main.c
+1
-1
su
jni/su
+1
-1
No files found.
jni/Android.mk
View file @
102a7f87
...
@@ -44,7 +44,7 @@ LOCAL_SRC_FILES := \
...
@@ -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)
...
...
jni/daemon/daemon.c
View file @
102a7f87
...
@@ -44,11 +44,11 @@ static void request_handler(int client) {
...
@@ -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
:
...
...
jni/magisk.h
View file @
102a7f87
...
@@ -10,10 +10,13 @@
...
@@ -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)
...
...
jni/main.c
View file @
102a7f87
...
@@ -58,7 +58,7 @@ int main(int argc, char *argv[]) {
...
@@ -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
);
...
...
su
@
b499ac8a
Subproject commit
4035d5b0379ddb69ce037c54587bd222710d0396
Subproject commit
b499ac8abacc9d009d110146e2f681a9b0a66f19
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment