MarcoBuster/Magisk
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Remove IS_VENDOR flag (not needed)

Browse Source
This commit is contained in:
topjohnwu 2017-08-11 11:29:35 +08:00
parent 273849c0c8
commit 8d431b6762
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jni/daemon/bootstages.c
View File

@ -39,8 +39,6 @@ static int debug_log_pid, debug_log_fd;
#define IS_SKEL 0x04 /* mount from skeleton */ #define IS_SKEL 0x04 /* mount from skeleton */
#define IS_MODULE 0x08 /* mount from module */ #define IS_MODULE 0x08 /* mount from module */
#define IS_VENDOR 0x10 /* special vendor placeholder */
#define IS_DIR(n) (n->type == DT_DIR) #define IS_DIR(n) (n->type == DT_DIR)
#define IS_LNK(n) (n->type == DT_LNK) #define IS_LNK(n) (n->type == DT_LNK)
#define IS_REG(n) (n->type == DT_REG) #define IS_REG(n) (n->type == DT_REG)
@ -273,7 +271,7 @@ static void clone_skeleton(struct node_entry *node) {
close(open_new(buf)); close(open_new(buf));
// Links will be handled later // Links will be handled later
if (child->status & IS_VENDOR) { 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("cplink: %s -> %s\n", MIRRDIR "/system/vendor", "/system/vendor"); LOGI("cplink: %s -> %s\n", MIRRDIR "/system/vendor", "/system/vendor");
@ -611,10 +609,10 @@ void post_fs_data(int client) {
child = xcalloc(sizeof(*child), 1); child = xcalloc(sizeof(*child), 1);
child->type = seperate_vendor ? DT_LNK : DT_DIR; child->type = seperate_vendor ? DT_LNK : DT_DIR;
child->parent = ven_root->parent; child->parent = ven_root->parent;
child->name = ven_root->name; child->name = strdup("vendor");
child->status = IS_VENDOR; child->status = 0;
// Swap!
vec_entry(sys_root->children)[_] = child; vec_entry(sys_root->children)[_] = child;
ven_root->name = strdup("vendor");
ven_root->parent = NULL; ven_root->parent = NULL;
break; break;
} }