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
930c8231
Commit
930c8231
authored
Dec 31, 2017
by
topjohnwu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Slightly change logging style
parent
3dc22db2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
bootstages.c
core/jni/core/bootstages.c
+4
-4
misc.c
core/jni/utils/misc.c
+1
-1
No files found.
core/jni/core/bootstages.c
View file @
930c8231
...
@@ -274,7 +274,7 @@ static void clone_skeleton(struct node_entry *node) {
...
@@ -274,7 +274,7 @@ static void clone_skeleton(struct node_entry *node) {
char
*
con
;
char
*
con
;
xstat
(
full_path
,
&
s
);
xstat
(
full_path
,
&
s
);
getfilecon
(
full_path
,
&
con
);
getfilecon
(
full_path
,
&
con
);
LOGI
(
"
tmpfs
: %s
\n
"
,
full_path
);
LOGI
(
"
mnt_tmpfs
: %s
\n
"
,
full_path
);
xmount
(
"tmpfs"
,
full_path
,
"tmpfs"
,
0
,
NULL
);
xmount
(
"tmpfs"
,
full_path
,
"tmpfs"
,
0
,
NULL
);
chmod
(
full_path
,
s
.
st_mode
&
0777
);
chmod
(
full_path
,
s
.
st_mode
&
0777
);
chown
(
full_path
,
s
.
st_uid
,
s
.
st_gid
);
chown
(
full_path
,
s
.
st_uid
,
s
.
st_gid
);
...
@@ -295,7 +295,7 @@ static void clone_skeleton(struct node_entry *node) {
...
@@ -295,7 +295,7 @@ static void clone_skeleton(struct node_entry *node) {
if
(
child
->
parent
->
parent
==
NULL
&&
strcmp
(
child
->
name
,
"vendor"
)
==
0
)
{
if
(
child
->
parent
->
parent
==
NULL
&&
strcmp
(
child
->
name
,
"vendor"
)
==
0
)
{
if
(
IS_LNK
(
child
))
{
if
(
IS_LNK
(
child
))
{
cp_afc
(
MIRRDIR
"/system/vendor"
,
"/system/vendor"
);
cp_afc
(
MIRRDIR
"/system/vendor"
,
"/system/vendor"
);
LOGI
(
"c
plink: %s -> %s
\n
"
,
MIRRDIR
"/system/vendor"
,
"/system/vendor"
);
LOGI
(
"c
reat_link: %s <- %s
\n
"
,
"/system/vendor"
,
MIRRDIR
"/system/vendor"
);
}
}
// Skip
// Skip
continue
;
continue
;
...
@@ -315,9 +315,9 @@ static void clone_skeleton(struct node_entry *node) {
...
@@ -315,9 +315,9 @@ static void clone_skeleton(struct node_entry *node) {
// Copy symlinks directly
// Copy symlinks directly
cp_afc
(
buf2
,
buf
);
cp_afc
(
buf2
,
buf
);
#ifdef MAGISK_DEBUG
#ifdef MAGISK_DEBUG
LOGI
(
"c
plink: %s -> %s
\n
"
,
buf2
,
buf
);
LOGI
(
"c
reat_link: %s <- %s
\n
"
,
buf
,
buf2
);
#else
#else
LOGI
(
"c
p
link: %s
\n
"
,
buf
);
LOGI
(
"c
reat_
link: %s
\n
"
,
buf
);
#endif
#endif
}
else
{
}
else
{
snprintf
(
buf
,
PATH_MAX
,
"%s/%s"
,
full_path
,
child
->
name
);
snprintf
(
buf
,
PATH_MAX
,
"%s/%s"
,
full_path
,
child
->
name
);
...
...
core/jni/utils/misc.c
View file @
930c8231
...
@@ -282,7 +282,7 @@ int exec_command(int err, int *fd, void (*setupenv)(struct vector*), const char
...
@@ -282,7 +282,7 @@ int exec_command(int err, int *fd, void (*setupenv)(struct vector*), const char
int
bind_mount
(
const
char
*
from
,
const
char
*
to
)
{
int
bind_mount
(
const
char
*
from
,
const
char
*
to
)
{
int
ret
=
xmount
(
from
,
to
,
NULL
,
MS_BIND
,
NULL
);
int
ret
=
xmount
(
from
,
to
,
NULL
,
MS_BIND
,
NULL
);
#ifdef MAGISK_DEBUG
#ifdef MAGISK_DEBUG
LOGI
(
"bind_mount: %s
-> %s
\n
"
,
from
,
to
);
LOGI
(
"bind_mount: %s
<- %s
\n
"
,
to
,
from
);
#else
#else
LOGI
(
"bind_mount: %s
\n
"
,
to
);
LOGI
(
"bind_mount: %s
\n
"
,
to
);
#endif
#endif
...
...
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