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
2efc423c
Commit
2efc423c
authored
Oct 28, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add missing flags and move debug logging logic to libutils
parent
8ec3086c
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
9 additions
and
4 deletions
+9
-4
daemon.c
native/jni/daemon/daemon.c
+0
-4
main.cpp
native/jni/magiskboot/main.cpp
+1
-0
magiskhide.c
native/jni/magiskhide/magiskhide.c
+1
-0
magiskpolicy.c
native/jni/magiskpolicy/magiskpolicy.c
+1
-0
resetprop.c
native/jni/resetprop/resetprop.c
+1
-0
logging.c
native/jni/utils/logging.c
+5
-0
No files found.
native/jni/daemon/daemon.c
View file @
2efc423c
...
...
@@ -18,7 +18,6 @@
#include "utils.h"
#include "daemon.h"
#include "selinux.h"
#include "flags.h"
int
setup_done
=
0
;
int
seperate_vendor
=
0
;
...
...
@@ -103,9 +102,6 @@ static void *request_handler(void *args) {
static
void
main_daemon
()
{
android_logging
();
#ifndef MAGISK_DEBUG
log_cb
.
d
=
nop_log
;
#endif
setsid
();
setcon
(
"u:r:"
SEPOL_PROC_DOMAIN
":s0"
);
int
fd
=
xopen
(
"/dev/null"
,
O_RDWR
|
O_CLOEXEC
);
...
...
native/jni/magiskboot/main.cpp
View file @
2efc423c
...
...
@@ -9,6 +9,7 @@
#include "magiskboot.h"
#include "logging.h"
#include "utils.h"
#include "flags.h"
/********************
Patch Boot Image
...
...
native/jni/magiskhide/magiskhide.c
View file @
2efc423c
...
...
@@ -15,6 +15,7 @@
#include "magiskhide.h"
#include "daemon.h"
#include "resetprop.h"
#include "flags.h"
struct
vector
*
hide_list
=
NULL
;
...
...
native/jni/magiskpolicy/magiskpolicy.c
View file @
2efc423c
...
...
@@ -10,6 +10,7 @@
#include "vector.h"
#include "magiskpolicy.h"
#include "magisk.h"
#include "flags.h"
static
int
syntax_err
=
0
;
static
char
err_msg
[
ARG_MAX
];
...
...
native/jni/resetprop/resetprop.c
View file @
2efc423c
...
...
@@ -22,6 +22,7 @@
#include "_resetprop.h"
#include "vector.h"
#include "utils.h"
#include "flags.h"
int
prop_verbose
=
0
;
...
...
native/jni/utils/logging.c
View file @
2efc423c
...
...
@@ -3,6 +3,7 @@
#include <android/log.h>
#include "logging.h"
#include "flags.h"
int
nop_log
(
const
char
*
fmt
,
va_list
ap
)
{
return
0
;
...
...
@@ -45,7 +46,11 @@ static int log_e(const char *fmt, va_list ap) {
}
void
android_logging
()
{
#ifdef MAGISK_DEBUG
log_cb
.
d
=
log_d
;
#else
log_cb
.
d
=
nop_log
;
#endif
log_cb
.
i
=
log_i
;
log_cb
.
w
=
log_w
;
log_cb
.
e
=
log_e
;
...
...
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