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
71ecbb3a
Commit
71ecbb3a
authored
Feb 10, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Clean/refactor includes
parent
5746614c
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
91 additions
and
85 deletions
+91
-85
applets.cpp
native/jni/core/applets.cpp
+2
-2
daemon.cpp
native/jni/core/daemon.cpp
+7
-7
db.cpp
native/jni/core/db.cpp
+3
-3
img.cpp
native/jni/core/img.cpp
+4
-4
init.cpp
native/jni/core/init.cpp
+5
-6
magiskrc.h
native/jni/core/magiskrc.h
+2
-2
socket.cpp
native/jni/core/socket.cpp
+4
-4
daemon.h
native/jni/include/daemon.h
+0
-1
magisk.h
native/jni/include/magisk.h
+0
-3
bootimg.cpp
native/jni/magiskboot/bootimg.cpp
+2
-2
compress.cpp
native/jni/magiskboot/compress.cpp
+2
-2
cpio.cpp
native/jni/magiskboot/cpio.cpp
+3
-2
dtb.cpp
native/jni/magiskboot/dtb.cpp
+1
-1
hexpatch.cpp
native/jni/magiskboot/hexpatch.cpp
+2
-1
main.cpp
native/jni/magiskboot/main.cpp
+3
-3
pattern.cpp
native/jni/magiskboot/pattern.cpp
+2
-1
ramdisk.cpp
native/jni/magiskboot/ramdisk.cpp
+2
-1
magiskhide.cpp
native/jni/magiskhide/magiskhide.cpp
+4
-3
magiskpolicy.cpp
native/jni/magiskpolicy/magiskpolicy.cpp
+4
-3
rules.cpp
native/jni/magiskpolicy/rules.cpp
+2
-1
sepolicy.c
native/jni/magiskpolicy/sepolicy.c
+3
-2
persist_properties.cpp
native/jni/resetprop/persist_properties.cpp
+1
-2
resetprop.cpp
native/jni/resetprop/resetprop.cpp
+5
-5
connect.cpp
native/jni/su/connect.cpp
+4
-3
pts.cpp
native/jni/su/pts.cpp
+2
-1
su.cpp
native/jni/su/su.cpp
+5
-4
su_daemon.cpp
native/jni/su/su_daemon.cpp
+5
-4
file.cpp
native/jni/utils/file.cpp
+3
-3
logging.cpp
native/jni/utils/logging.cpp
+2
-2
misc.cpp
native/jni/utils/misc.cpp
+2
-2
selinux.cpp
native/jni/utils/selinux.cpp
+3
-3
xwrap.cpp
native/jni/utils/xwrap.cpp
+2
-2
No files found.
native/jni/core/applets.cpp
View file @
71ecbb3a
...
@@ -4,8 +4,8 @@
...
@@ -4,8 +4,8 @@
#include <sys/types.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/stat.h>
#include
"magisk.h"
#include
<magisk.h>
#include
"selinux.h"
#include
<selinux.h>
static
int
(
*
applet_main
[])
(
int
,
char
*
[])
=
static
int
(
*
applet_main
[])
(
int
,
char
*
[])
=
{
magisk_main
,
su_client_main
,
resetprop_main
,
magiskhide_main
,
imgtool_main
,
nullptr
};
{
magisk_main
,
su_client_main
,
resetprop_main
,
magiskhide_main
,
imgtool_main
,
nullptr
};
...
...
native/jni/core/daemon.cpp
View file @
71ecbb3a
...
@@ -14,13 +14,13 @@
...
@@ -14,13 +14,13 @@
#include <sys/types.h>
#include <sys/types.h>
#include <sys/mount.h>
#include <sys/mount.h>
#include
"magisk.h"
#include
<magisk.h>
#include
"utils.h"
#include
<utils.h>
#include
"daemon.h"
#include
<daemon.h>
#include
"selinux.h"
#include
<selinux.h>
#include
"db.h"
#include
<db.h>
#include
"resetprop.h"
#include
<resetprop.h>
#include
"flags.h"
#include
<flags.h>
int
SDK_INT
=
-
1
;
int
SDK_INT
=
-
1
;
struct
stat
SERVER_STAT
;
struct
stat
SERVER_STAT
;
...
...
native/jni/core/db.cpp
View file @
71ecbb3a
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
#include <unistd.h>
#include <unistd.h>
#include <sys/stat.h>
#include <sys/stat.h>
#include
"magisk.h"
#include
<magisk.h>
#include
"db.h"
#include
<db.h>
#include
"daemon.h"
#include
<daemon.h>
#define DB_VERSION 7
#define DB_VERSION 7
...
...
native/jni/core/img.cpp
View file @
71ecbb3a
...
@@ -14,10 +14,10 @@
...
@@ -14,10 +14,10 @@
#include <sys/sysmacros.h>
#include <sys/sysmacros.h>
#include <linux/loop.h>
#include <linux/loop.h>
#include
"magisk.h"
#include
<magisk.h>
#include
"utils.h"
#include
<utils.h>
#include
"img.h"
#include
<img.h>
#include
"flags.h"
#include
<flags.h>
#define round_size(a) ((((a) / 32) + 2) * 32)
#define round_size(a) ((((a) / 32) + 2) * 32)
#define SOURCE_TMP "/dev/.img_src"
#define SOURCE_TMP "/dev/.img_src"
...
...
native/jni/core/init.cpp
View file @
71ecbb3a
...
@@ -37,16 +37,15 @@
...
@@ -37,16 +37,15 @@
#include <string_view>
#include <string_view>
#include <xz.h>
#include <xz.h>
#include <magisk.h>
#include <magiskpolicy.h>
#include <selinux.h>
#include <utils.h>
#include <flags.h>
#include "binaries.h"
#include "binaries.h"
#include "binaries_arch.h"
#include "binaries_arch.h"
#include "magiskrc.h"
#include "magiskrc.h"
#include "magisk.h"
#include "magiskpolicy.h"
#include "selinux.h"
#include "utils.h"
#include "flags.h"
#define DEFAULT_DT_DIR "/proc/device-tree/firmware/android"
#define DEFAULT_DT_DIR "/proc/device-tree/firmware/android"
...
...
native/jni/
includ
e/magiskrc.h
→
native/jni/
cor
e/magiskrc.h
View file @
71ecbb3a
#include
"magisk.h"
#include
<magisk.h>
#include
"magiskpolicy.h"
#include
<magiskpolicy.h>
static
const
char
magiskrc
[]
=
static
const
char
magiskrc
[]
=
...
...
native/jni/core/socket.cpp
View file @
71ecbb3a
...
@@ -6,10 +6,10 @@
...
@@ -6,10 +6,10 @@
#include <fcntl.h>
#include <fcntl.h>
#include <endian.h>
#include <endian.h>
#include
"daemon.h"
#include
<daemon.h>
#include
"logging.h"
#include
<logging.h>
#include
"utils.h"
#include
<utils.h>
#include
"magisk.h"
#include
<magisk.h>
#define ABS_SOCKET_LEN(sun) (sizeof(sa_family_t) + strlen(sun->sun_path + 1) + 1)
#define ABS_SOCKET_LEN(sun) (sizeof(sa_family_t) + strlen(sun->sun_path + 1) + 1)
...
...
native/jni/include/daemon.h
View file @
71ecbb3a
...
@@ -4,7 +4,6 @@
...
@@ -4,7 +4,6 @@
#ifndef _DAEMON_H_
#ifndef _DAEMON_H_
#define _DAEMON_H_
#define _DAEMON_H_
#include <stdbool.h>
#include <pthread.h>
#include <pthread.h>
#include <sys/un.h>
#include <sys/un.h>
#include <sys/socket.h>
#include <sys/socket.h>
...
...
native/jni/include/magisk.h
View file @
71ecbb3a
...
@@ -27,7 +27,6 @@
...
@@ -27,7 +27,6 @@
#define SIMPLEMOUNT SECURE_DIR "/magisk_simple"
#define SIMPLEMOUNT SECURE_DIR "/magisk_simple"
#define BOOTCOUNT SECURE_DIR "/.boot_count"
#define BOOTCOUNT SECURE_DIR "/.boot_count"
#define MANAGERAPK DATABIN "/magisk.apk"
#define MANAGERAPK DATABIN "/magisk.apk"
#define MAGISKRC "/init.magisk.rc"
// selinux consts
// selinux consts
#define SELINUX_PATH "/sys/fs/selinux"
#define SELINUX_PATH "/sys/fs/selinux"
...
@@ -38,8 +37,6 @@
...
@@ -38,8 +37,6 @@
#define SEPOL_PROC_DOMAIN "magisk"
#define SEPOL_PROC_DOMAIN "magisk"
#define SEPOL_FILE_DOMAIN "magisk_file"
#define SEPOL_FILE_DOMAIN "magisk_file"
#define MAGISKHIDE_PROP "persist.magisk.hide"
extern
char
*
argv0
;
/* For changing process name */
extern
char
*
argv0
;
/* For changing process name */
extern
int
SDK_INT
;
extern
int
SDK_INT
;
...
...
native/jni/magiskboot/bootimg.cpp
View file @
71ecbb3a
...
@@ -6,11 +6,11 @@
...
@@ -6,11 +6,11 @@
#include <mincrypt/sha.h>
#include <mincrypt/sha.h>
#include <mincrypt/sha256.h>
#include <mincrypt/sha256.h>
#include <utils.h>
#include <logging.h>
#include "bootimg.h"
#include "bootimg.h"
#include "magiskboot.h"
#include "magiskboot.h"
#include "utils.h"
#include "logging.h"
static
void
dump
(
void
*
buf
,
size_t
size
,
const
char
*
filename
)
{
static
void
dump
(
void
*
buf
,
size_t
size
,
const
char
*
filename
)
{
if
(
size
==
0
)
if
(
size
==
0
)
...
...
native/jni/magiskboot/compress.cpp
View file @
71ecbb3a
...
@@ -10,10 +10,10 @@
...
@@ -10,10 +10,10 @@
#include <lz4frame.h>
#include <lz4frame.h>
#include <lz4hc.h>
#include <lz4hc.h>
#include <bzlib.h>
#include <bzlib.h>
#include <logging.h>
#include <utils.h>
#include "magiskboot.h"
#include "magiskboot.h"
#include "logging.h"
#include "utils.h"
#define CHUNK 0x40000
#define CHUNK 0x40000
...
...
native/jni/magiskboot/cpio.cpp
View file @
71ecbb3a
...
@@ -4,9 +4,10 @@
...
@@ -4,9 +4,10 @@
#include <stdlib.h>
#include <stdlib.h>
#include <algorithm>
#include <algorithm>
#include <utils.h>
#include <logging.h>
#include "cpio.h"
#include "cpio.h"
#include "utils.h"
#include "logging.h"
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/magiskboot/dtb.cpp
View file @
71ecbb3a
...
@@ -3,9 +3,9 @@
...
@@ -3,9 +3,9 @@
extern
"C"
{
extern
"C"
{
#include <libfdt.h>
#include <libfdt.h>
}
}
#include <utils.h>
#include "magiskboot.h"
#include "magiskboot.h"
#include "utils.h"
static
void
print_props
(
const
void
*
fdt
,
int
node
,
int
depth
)
{
static
void
print_props
(
const
void
*
fdt
,
int
node
,
int
depth
)
{
int
prop
;
int
prop
;
...
...
native/jni/magiskboot/hexpatch.cpp
View file @
71ecbb3a
...
@@ -3,8 +3,9 @@
...
@@ -3,8 +3,9 @@
#include <string.h>
#include <string.h>
#include <sys/mman.h>
#include <sys/mman.h>
#include <utils.h>
#include "magiskboot.h"
#include "magiskboot.h"
#include "utils.h"
static
void
hex2byte
(
uint8_t
*
hex
,
uint8_t
*
str
)
{
static
void
hex2byte
(
uint8_t
*
hex
,
uint8_t
*
str
)
{
char
high
,
low
;
char
high
,
low
;
...
...
native/jni/magiskboot/main.cpp
View file @
71ecbb3a
...
@@ -5,11 +5,11 @@
...
@@ -5,11 +5,11 @@
#include <sys/mman.h>
#include <sys/mman.h>
#include <mincrypt/sha.h>
#include <mincrypt/sha.h>
#include <logging.h>
#include <utils.h>
#include <flags.h>
#include "magiskboot.h"
#include "magiskboot.h"
#include "logging.h"
#include "utils.h"
#include "flags.h"
/********************
/********************
Patch Boot Image
Patch Boot Image
...
...
native/jni/magiskboot/pattern.cpp
View file @
71ecbb3a
#include <malloc.h>
#include <malloc.h>
#include <string.h>
#include <string.h>
#include <utils.h>
#include "magiskboot.h"
#include "magiskboot.h"
#include "utils.h"
static
int
check_verity_pattern
(
const
char
*
s
)
{
static
int
check_verity_pattern
(
const
char
*
s
)
{
int
skip
=
0
;
int
skip
=
0
;
...
...
native/jni/magiskboot/ramdisk.cpp
View file @
71ecbb3a
...
@@ -2,9 +2,10 @@
...
@@ -2,9 +2,10 @@
#include <stdlib.h>
#include <stdlib.h>
#include <sys/stat.h>
#include <sys/stat.h>
#include <utils.h>
#include "magiskboot.h"
#include "magiskboot.h"
#include "cpio.h"
#include "cpio.h"
#include "utils.h"
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/magiskhide/magiskhide.cpp
View file @
71ecbb3a
...
@@ -7,10 +7,11 @@
...
@@ -7,10 +7,11 @@
#include <sys/wait.h>
#include <sys/wait.h>
#include <sys/types.h>
#include <sys/types.h>
#include "magisk.h"
#include <magisk.h>
#include <daemon.h>
#include <flags.h>
#include "magiskhide.h"
#include "magiskhide.h"
#include "daemon.h"
#include "flags.h"
bool
hide_enabled
=
false
;
bool
hide_enabled
=
false
;
...
...
native/jni/magiskpolicy/magiskpolicy.cpp
View file @
71ecbb3a
...
@@ -8,11 +8,12 @@
...
@@ -8,11 +8,12 @@
#include <vector>
#include <vector>
#include <string>
#include <string>
#include <magisk.h>
#include <utils.h>
#include <flags.h>
#include "sepolicy.h"
#include "sepolicy.h"
#include "magiskpolicy.h"
#include "magiskpolicy.h"
#include "magisk.h"
#include "utils.h"
#include "flags.h"
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/magiskpolicy/rules.cpp
View file @
71ecbb3a
#include "magisk.h"
#include <magisk.h>
#include "magiskpolicy.h"
#include "magiskpolicy.h"
#include "sepolicy.h"
#include "sepolicy.h"
...
...
native/jni/magiskpolicy/sepolicy.c
View file @
71ecbb3a
...
@@ -19,10 +19,11 @@
...
@@ -19,10 +19,11 @@
#include <sepol/policydb/conditional.h>
#include <sepol/policydb/conditional.h>
#include <sepol/policydb/constraint.h>
#include <sepol/policydb/constraint.h>
#include "utils.h"
#include <utils.h>
#include <logging.h>
#include "magiskpolicy.h"
#include "magiskpolicy.h"
#include "sepolicy.h"
#include "sepolicy.h"
#include "logging.h"
policydb_t
*
policydb
=
NULL
;
policydb_t
*
policydb
=
NULL
;
extern
int
policydb_index_decls
(
sepol_handle_t
*
handle
,
policydb_t
*
p
);
extern
int
policydb_index_decls
(
sepol_handle_t
*
handle
,
policydb_t
*
p
);
...
...
native/jni/resetprop/persist_properties.cpp
View file @
71ecbb3a
...
@@ -4,15 +4,14 @@
...
@@ -4,15 +4,14 @@
#include <stdlib.h>
#include <stdlib.h>
#include <unistd.h>
#include <unistd.h>
#include <sys/mman.h>
#include <sys/mman.h>
#include <vector>
#include <vector>
#include <pb.h>
#include <pb.h>
#include <pb_decode.h>
#include <pb_decode.h>
#include <pb_encode.h>
#include <pb_encode.h>
#include <utils.h>
#include "_resetprop.h"
#include "_resetprop.h"
#include "utils.h"
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/resetprop/resetprop.cpp
View file @
71ecbb3a
...
@@ -9,15 +9,15 @@
...
@@ -9,15 +9,15 @@
#include <vector>
#include <vector>
#include <algorithm>
#include <algorithm>
#include <magisk.h>
#include <resetprop.h>
#include <utils.h>
#include <flags.h>
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#define _REALLY_INCLUDE_SYS__SYSTEM_PROPERTIES_H_
#include "private/_system_properties.h"
#include "private/_system_properties.h"
#include "private/system_properties.h"
#include "private/system_properties.h"
#include "magisk.h"
#include "resetprop.h"
#include "_resetprop.h"
#include "_resetprop.h"
#include "utils.h"
#include "flags.h"
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/su/connect.cpp
View file @
71ecbb3a
...
@@ -12,9 +12,10 @@
...
@@ -12,9 +12,10 @@
#include <fcntl.h>
#include <fcntl.h>
#include <stdio.h>
#include <stdio.h>
#include "magisk.h"
#include <magisk.h>
#include "daemon.h"
#include <daemon.h>
#include "utils.h"
#include <utils.h>
#include "su.h"
#include "su.h"
#define BROADCAST_BOOT_COMPLETED \
#define BROADCAST_BOOT_COMPLETED \
...
...
native/jni/su/pts.cpp
View file @
71ecbb3a
...
@@ -17,7 +17,8 @@
...
@@ -17,7 +17,8 @@
#include <errno.h>
#include <errno.h>
#include <pthread.h>
#include <pthread.h>
#include "magisk.h"
#include <magisk.h>
#include "pts.h"
#include "pts.h"
/**
/**
...
...
native/jni/su/su.cpp
View file @
71ecbb3a
...
@@ -21,12 +21,13 @@
...
@@ -21,12 +21,13 @@
#include <sys/types.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/stat.h>
#include "magisk.h"
#include <magisk.h>
#include "daemon.h"
#include <daemon.h>
#include "utils.h"
#include <utils.h>
#include <flags.h>
#include "su.h"
#include "su.h"
#include "pts.h"
#include "pts.h"
#include "flags.h"
int
quit_signals
[]
=
{
SIGALRM
,
SIGABRT
,
SIGHUP
,
SIGPIPE
,
SIGQUIT
,
SIGTERM
,
SIGINT
,
0
};
int
quit_signals
[]
=
{
SIGALRM
,
SIGABRT
,
SIGHUP
,
SIGPIPE
,
SIGQUIT
,
SIGTERM
,
SIGINT
,
0
};
...
...
native/jni/su/su_daemon.cpp
View file @
71ecbb3a
...
@@ -11,12 +11,13 @@
...
@@ -11,12 +11,13 @@
#include <sys/stat.h>
#include <sys/stat.h>
#include <sys/wait.h>
#include <sys/wait.h>
#include "magisk.h"
#include <magisk.h>
#include "daemon.h"
#include <daemon.h>
#include "utils.h"
#include <utils.h>
#include <selinux.h>
#include "su.h"
#include "su.h"
#include "pts.h"
#include "pts.h"
#include "selinux.h"
#define LOCK_CACHE() pthread_mutex_lock(&cache_lock)
#define LOCK_CACHE() pthread_mutex_lock(&cache_lock)
#define UNLOCK_CACHE() pthread_mutex_unlock(&cache_lock)
#define UNLOCK_CACHE() pthread_mutex_unlock(&cache_lock)
...
...
native/jni/utils/file.cpp
View file @
71ecbb3a
...
@@ -11,9 +11,9 @@
...
@@ -11,9 +11,9 @@
#include <sys/mman.h>
#include <sys/mman.h>
#include <linux/fs.h>
#include <linux/fs.h>
#include
"magisk.h"
#include
<magisk.h>
#include
"utils.h"
#include
<utils.h>
#include
"selinux.h"
#include
<selinux.h>
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/utils/logging.cpp
View file @
71ecbb3a
...
@@ -2,8 +2,8 @@
...
@@ -2,8 +2,8 @@
#include <stdlib.h>
#include <stdlib.h>
#include <android/log.h>
#include <android/log.h>
#include
"logging.h"
#include
<logging.h>
#include
"flags.h"
#include
<flags.h>
int
nop_log
(
const
char
*
fmt
,
va_list
ap
)
{
int
nop_log
(
const
char
*
fmt
,
va_list
ap
)
{
return
0
;
return
0
;
...
...
native/jni/utils/misc.cpp
View file @
71ecbb3a
...
@@ -13,8 +13,8 @@
...
@@ -13,8 +13,8 @@
#include <sys/sysmacros.h>
#include <sys/sysmacros.h>
#include <vector>
#include <vector>
#include
"logging.h"
#include
<logging.h>
#include
"utils.h"
#include
<utils.h>
using
namespace
std
;
using
namespace
std
;
...
...
native/jni/utils/selinux.cpp
View file @
71ecbb3a
...
@@ -5,9 +5,9 @@
...
@@ -5,9 +5,9 @@
#include <syscall.h>
#include <syscall.h>
#include <sys/xattr.h>
#include <sys/xattr.h>
#include
"magisk.h"
#include
<magisk.h>
#include
"utils.h"
#include
<utils.h>
#include
"selinux.h"
#include
<selinux.h>
#define UNLABEL_CON "u:object_r:unlabeled:s0"
#define UNLABEL_CON "u:object_r:unlabeled:s0"
#define SYSTEM_CON "u:object_r:system_file:s0"
#define SYSTEM_CON "u:object_r:system_file:s0"
...
...
native/jni/utils/xwrap.cpp
View file @
71ecbb3a
...
@@ -22,8 +22,8 @@
...
@@ -22,8 +22,8 @@
#include <sys/sendfile.h>
#include <sys/sendfile.h>
#include <sys/syscall.h>
#include <sys/syscall.h>
#include
"logging.h"
#include
<logging.h>
#include
"utils.h"
#include
<utils.h>
FILE
*
xfopen
(
const
char
*
pathname
,
const
char
*
mode
)
{
FILE
*
xfopen
(
const
char
*
pathname
,
const
char
*
mode
)
{
FILE
*
fp
=
fopen
(
pathname
,
mode
);
FILE
*
fp
=
fopen
(
pathname
,
mode
);
...
...
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