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
2a694596
Commit
2a694596
authored
Dec 05, 2020
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better error handling and logging
parent
ff0a7660
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
3 deletions
+17
-3
mount.cpp
native/jni/init/mount.cpp
+1
-0
raw_data.cpp
native/jni/init/raw_data.cpp
+7
-1
files.cpp
native/jni/utils/files.cpp
+9
-2
No files found.
native/jni/init/mount.cpp
View file @
2a694596
...
...
@@ -346,6 +346,7 @@ void SARInit::early_mount() {
auto
init
=
raw_data
::
mmap_ro
(
"/init"
);
is_two_stage
=
init
.
contains
(
"selinux_setup"
);
}
LOGD
(
"is_two_stage: [%d]
\n
"
,
is_two_stage
);
if
(
!
is_two_stage
)
{
// Make dev writable
...
...
native/jni/init/raw_data.cpp
View file @
2a694596
...
...
@@ -3,6 +3,8 @@
using
namespace
std
;
int
data_holder
::
patch
(
str_pairs
list
)
{
if
(
buf
==
nullptr
)
return
0
;
int
count
=
0
;
for
(
uint8_t
*
p
=
buf
,
*
eof
=
buf
+
sz
;
p
<
eof
;
++
p
)
{
for
(
auto
[
from
,
to
]
:
list
)
{
...
...
@@ -19,9 +21,13 @@ int data_holder::patch(str_pairs list) {
}
bool
data_holder
::
contains
(
string_view
pattern
)
{
if
(
buf
==
nullptr
)
return
false
;
for
(
uint8_t
*
p
=
buf
,
*
eof
=
buf
+
sz
;
p
<
eof
;
++
p
)
{
if
(
memcmp
(
p
,
pattern
.
data
(),
pattern
.
length
()
+
1
)
==
0
)
if
(
memcmp
(
p
,
pattern
.
data
(),
pattern
.
length
()
+
1
)
==
0
)
{
LOGD
(
"Found pattern [%s]
\n
"
,
pattern
.
data
());
return
true
;
}
}
return
false
;
}
...
...
native/jni/utils/files.cpp
View file @
2a694596
...
...
@@ -273,10 +273,17 @@ void fclone_attr(int src, int dest) {
}
void
*
__mmap
(
const
char
*
filename
,
size_t
*
size
,
bool
rw
)
{
int
fd
=
xopen
(
filename
,
(
rw
?
O_RDWR
:
O_RDONLY
)
|
O_CLOEXEC
);
if
(
fd
<
0
)
{
*
size
=
0
;
return
nullptr
;
}
struct
stat
st
;
void
*
buf
;
int
fd
=
xopen
(
filename
,
(
rw
?
O_RDWR
:
O_RDONLY
)
|
O_CLOEXEC
);
fstat
(
fd
,
&
st
);
if
(
fstat
(
fd
,
&
st
))
{
*
size
=
0
;
return
nullptr
;
}
if
(
S_ISBLK
(
st
.
st_mode
))
ioctl
(
fd
,
BLKGETSIZE64
,
size
);
else
...
...
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