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
6add0270
Commit
6add0270
authored
Oct 26, 2018
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug in MagiskBoot
parent
958d6377
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
19 additions
and
11 deletions
+19
-11
cpio.cpp
native/jni/magiskboot/cpio.cpp
+3
-2
cpio.h
native/jni/magiskboot/cpio.h
+6
-6
ramdisk.cpp
native/jni/magiskboot/ramdisk.cpp
+10
-3
No files found.
native/jni/magiskboot/cpio.cpp
View file @
6add0270
...
@@ -211,9 +211,10 @@ bool cpio::mv(const char *from, const char *to) {
...
@@ -211,9 +211,10 @@ bool cpio::mv(const char *from, const char *to) {
delete
arr
[
t
];
delete
arr
[
t
];
arr
[
t
]
=
nullptr
;
arr
[
t
]
=
nullptr
;
}
}
free
(
arr
[
f
]
->
filename
);
arr
[
f
]
->
filename
=
strdup
(
to
);
fprintf
(
stderr
,
"Move [%s] -> [%s]
\n
"
,
from
,
to
);
fprintf
(
stderr
,
"Move [%s] -> [%s]
\n
"
,
from
,
to
);
char
*
tmp
=
strdup
(
to
);
free
(
arr
[
f
]
->
filename
);
arr
[
f
]
->
filename
=
tmp
;
return
true
;
return
true
;
}
}
fprintf
(
stderr
,
"Cannot find entry %s
\n
"
,
from
);
fprintf
(
stderr
,
"Cannot find entry %s
\n
"
,
from
);
...
...
native/jni/magiskboot/cpio.h
View file @
6add0270
...
@@ -24,20 +24,20 @@ struct cpio_newc_header {
...
@@ -24,20 +24,20 @@ struct cpio_newc_header {
struct
cpio_entry
{
struct
cpio_entry
{
// uint32_t ino;
// uint32_t ino;
uint32_t
mode
;
uint32_t
mode
=
0
;
uint32_t
uid
;
uint32_t
uid
=
0
;
uint32_t
gid
;
uint32_t
gid
=
0
;
// uint32_t nlink;
// uint32_t nlink;
// uint32_t mtime;
// uint32_t mtime;
uint32_t
filesize
;
uint32_t
filesize
=
0
;
// uint32_t devmajor;
// uint32_t devmajor;
// uint32_t devminor;
// uint32_t devminor;
// uint32_t rdevmajor;
// uint32_t rdevmajor;
// uint32_t rdevminor;
// uint32_t rdevminor;
// uint32_t namesize;
// uint32_t namesize;
// uint32_t check;
// uint32_t check;
char
*
filename
;
char
*
filename
=
nullptr
;
void
*
data
;
void
*
data
=
nullptr
;
cpio_entry
()
{}
cpio_entry
()
{}
cpio_entry
(
int
fd
,
cpio_newc_header
&
header
);
cpio_entry
(
int
fd
,
cpio_newc_header
&
header
);
...
...
native/jni/magiskboot/ramdisk.cpp
View file @
6add0270
...
@@ -208,10 +208,17 @@ int cpio_commands(int argc, char *argv[]) {
...
@@ -208,10 +208,17 @@ int cpio_commands(int argc, char *argv[]) {
char
*
cmdv
[
6
];
char
*
cmdv
[
6
];
while
(
argc
)
{
while
(
argc
)
{
// Clean up
cmdc
=
0
;
cmdc
=
0
;
for
(
char
*
tok
=
strtok
(
argv
[
0
],
" "
);
tok
;
tok
=
strtok
(
NULL
,
" "
))
memset
(
cmdv
,
NULL
,
sizeof
(
cmdv
));
// Split the commands
for
(
char
*
tok
=
strtok
(
argv
[
0
],
" "
);
tok
;
tok
=
strtok
(
nullptr
,
" "
))
cmdv
[
cmdc
++
]
=
tok
;
cmdv
[
cmdc
++
]
=
tok
;
if
(
cmdc
==
0
)
continue
;
if
(
strcmp
(
cmdv
[
0
],
"test"
)
==
0
)
{
if
(
strcmp
(
cmdv
[
0
],
"test"
)
==
0
)
{
exit
(
cpio
.
test
());
exit
(
cpio
.
test
());
}
else
if
(
strcmp
(
cmdv
[
0
],
"restore"
)
==
0
)
{
}
else
if
(
strcmp
(
cmdv
[
0
],
"restore"
)
==
0
)
{
...
@@ -224,13 +231,13 @@ int cpio_commands(int argc, char *argv[]) {
...
@@ -224,13 +231,13 @@ int cpio_commands(int argc, char *argv[]) {
return
0
;
return
0
;
}
else
if
(
cmdc
>=
2
&&
strcmp
(
cmdv
[
0
],
"backup"
)
==
0
)
{
}
else
if
(
cmdc
>=
2
&&
strcmp
(
cmdv
[
0
],
"backup"
)
==
0
)
{
auto
bak
=
Array
<
cpio_entry
*>
();
auto
bak
=
Array
<
cpio_entry
*>
();
cpio
.
backup
(
bak
,
cmdv
[
1
],
cmd
c
>
2
?
cmdv
[
2
]
:
nullptr
);
cpio
.
backup
(
bak
,
cmdv
[
1
],
cmd
v
[
2
]
);
cpio
.
insert
(
bak
);
cpio
.
insert
(
bak
);
}
else
if
(
cmdc
>=
4
&&
strcmp
(
cmdv
[
0
],
"magisk"
)
==
0
)
{
}
else
if
(
cmdc
>=
4
&&
strcmp
(
cmdv
[
0
],
"magisk"
)
==
0
)
{
cpio
.
patch
(
strcmp
(
cmdv
[
2
],
"true"
)
==
0
,
strcmp
(
cmdv
[
3
],
"true"
)
==
0
);
cpio
.
patch
(
strcmp
(
cmdv
[
2
],
"true"
)
==
0
,
strcmp
(
cmdv
[
3
],
"true"
)
==
0
);
auto
bak
=
Array
<
cpio_entry
*>
();
auto
bak
=
Array
<
cpio_entry
*>
();
cpio
.
backup
(
bak
,
cmdv
[
1
],
cmd
c
>
4
?
cmdv
[
4
]
:
nullptr
);
cpio
.
backup
(
bak
,
cmdv
[
1
],
cmd
v
[
4
]
);
auto
e
=
new
cpio_entry
();
auto
e
=
new
cpio_entry
();
e
->
filename
=
strdup
(
".backup/.magisk"
);
e
->
filename
=
strdup
(
".backup/.magisk"
);
...
...
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