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
34bb1844
Commit
34bb1844
authored
Nov 23, 2019
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix compile errors
parent
01253f05
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
rules.cpp
native/jni/magiskpolicy/rules.cpp
+1
-1
files.h
native/jni/utils/files.h
+2
-1
stream.h
native/jni/utils/include/stream.h
+1
-2
No files found.
native/jni/magiskpolicy/rules.cpp
View file @
34bb1844
...
...
@@ -196,7 +196,7 @@ void sepol_magisk_rules() {
// Allow update_engine/addon.d-v2 to run permissive on all ROMs
sepol_permissive
(
"update_engine"
);
#if
def MAGISK_DEBUG
#if
0
// Remove all dontaudit in debug mode
strip_dontaudit();
#endif
...
...
native/jni/utils/files.h
View file @
34bb1844
#pragma once
#include <mntent.h>
#include <functional>
#include <string_view>
...
...
@@ -42,7 +43,7 @@ void parse_prop_file(const char *file, const std::function
void
*
__mmap
(
const
char
*
filename
,
size_t
*
size
,
bool
rw
);
void
frm_rf
(
int
dirfd
,
std
::
initializer_list
<
const
char
*>
excl
=
std
::
initializer_list
<
const
char
*>
());
void
clone_dir
(
int
src
,
int
dest
,
bool
overwrite
=
true
);
void
parse_mnt
(
const
char
*
file
,
const
std
::
function
<
bool
(
mntent
*
)
>
&
fn
);
void
parse_mnt
(
const
char
*
file
,
const
std
::
function
<
bool
(
mntent
*
)
>
&
fn
);
template
<
typename
T
>
void
full_read
(
const
char
*
filename
,
T
&
buf
,
size_t
&
size
)
{
...
...
native/jni/utils/include/stream.h
View file @
34bb1844
...
...
@@ -27,8 +27,7 @@ public:
// Delegates all operations to the base FILE pointer
class
filter_stream
:
public
stream
{
public
:
filter_stream
()
=
default
;
filter_stream
(
sFILE
&&
fp
)
:
fp
(
std
::
move
(
fp
))
{}
filter_stream
(
sFILE
&&
fp
=
make_sFILE
())
:
fp
(
std
::
move
(
fp
))
{}
int
read
(
void
*
buf
,
size_t
len
)
override
;
int
write
(
const
void
*
buf
,
size_t
len
)
override
;
...
...
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