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
79140c76
Commit
79140c76
authored
Jan 17, 2021
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Proper xxread and xwrite implementation
parent
1f4c595c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
23 additions
and
9 deletions
+23
-9
gradle.properties
gradle.properties
+1
-1
xwrap.cpp
native/jni/utils/xwrap.cpp
+22
-8
No files found.
gradle.properties
View file @
79140c76
...
@@ -27,6 +27,6 @@ android.injected.testOnly=false
...
@@ -27,6 +27,6 @@ android.injected.testOnly=false
kapt.incremental.apt
=
true
kapt.incremental.apt
=
true
# Magisk
# Magisk
magisk.versionCode
=
2130
3
magisk.versionCode
=
2130
4
magisk.ndkVersion
=
21d
magisk.ndkVersion
=
21d
magisk.fullNdkVersion
=
21.3.6528147
magisk.fullNdkVersion
=
21.3.6528147
native/jni/utils/xwrap.cpp
View file @
79140c76
...
@@ -61,12 +61,24 @@ int xopenat(int dirfd, const char *pathname, int flags, mode_t mode) {
...
@@ -61,12 +61,24 @@ int xopenat(int dirfd, const char *pathname, int flags, mode_t mode) {
return
fd
;
return
fd
;
}
}
// Write exact same size as count
ssize_t
xwrite
(
int
fd
,
const
void
*
buf
,
size_t
count
)
{
ssize_t
xwrite
(
int
fd
,
const
void
*
buf
,
size_t
count
)
{
int
ret
=
write
(
fd
,
buf
,
count
);
size_t
write_sz
=
0
;
if
(
count
!=
ret
)
{
ssize_t
ret
;
PLOGE
(
"write"
);
do
{
ret
=
write
(
fd
,
(
byte
*
)
buf
+
write_sz
,
count
-
write_sz
);
if
(
ret
<
0
)
{
if
(
errno
==
EINTR
)
continue
;
PLOGE
(
"write"
);
return
ret
;
}
write_sz
+=
ret
;
}
while
(
write_sz
!=
count
&&
ret
!=
0
);
if
(
write_sz
!=
count
)
{
PLOGE
(
"write (%zu != %zu)"
,
count
,
write_sz
);
}
}
return
ret
;
return
write_sz
;
}
}
// Read error other than EOF
// Read error other than EOF
...
@@ -81,15 +93,17 @@ ssize_t xread(int fd, void *buf, size_t count) {
...
@@ -81,15 +93,17 @@ ssize_t xread(int fd, void *buf, size_t count) {
// Read exact same size as count
// Read exact same size as count
ssize_t
xxread
(
int
fd
,
void
*
buf
,
size_t
count
)
{
ssize_t
xxread
(
int
fd
,
void
*
buf
,
size_t
count
)
{
size_t
read_sz
=
0
;
size_t
read_sz
=
0
;
int
ret
=
-
1
;
ssize_t
ret
;
while
(
read_sz
!=
count
&&
ret
!=
0
)
{
do
{
ret
=
read
(
fd
,
buf
,
count
);
ret
=
read
(
fd
,
(
byte
*
)
buf
+
read_sz
,
count
-
read_sz
);
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
if
(
errno
==
EINTR
)
continue
;
PLOGE
(
"read"
);
PLOGE
(
"read"
);
return
ret
;
return
ret
;
}
}
read_sz
+=
ret
;
read_sz
+=
ret
;
}
}
while
(
read_sz
!=
count
&&
ret
!=
0
);
if
(
read_sz
!=
count
)
{
if
(
read_sz
!=
count
)
{
PLOGE
(
"read (%zu != %zu)"
,
count
,
read_sz
);
PLOGE
(
"read (%zu != %zu)"
,
count
,
read_sz
);
}
}
...
...
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