ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "mkbootfs: Fix the default st_mode for root directory."

Browse source
This commit is contained in:
Treehugger Robot 2016-10-08 20:16:57 +00:00 • committed by Gerrit Code Review
commit 3dee9f1f6f
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cpio/mkbootfs.c
View file

@ -51,6 +51,8 @@ static char *target_out_path = NULL;
#define CANNED_LINE_LENGTH (1024) #define CANNED_LINE_LENGTH (1024)
#endif #endif
#define TRAILER "TRAILER!!!"
static int verbose = 0; static int verbose = 0;
static int total_size = 0; static int total_size = 0;
@ -80,8 +82,8 @@ static void fix_stat(const char *path, struct stat *s)
} else { } else {
// Use the compiled-in fs_config() function. // Use the compiled-in fs_config() function.
unsigned st_mode = s->st_mode; unsigned st_mode = s->st_mode;
fs_config(path, S_ISDIR(s->st_mode), target_out_path, int is_dir = S_ISDIR(s->st_mode) || strcmp(path, TRAILER) == 0;
&s->st_uid, &s->st_gid, &st_mode, &capabilities); fs_config(path, is_dir, target_out_path, &s->st_uid, &s->st_gid, &st_mode, &capabilities);
s->st_mode = (typeof(s->st_mode)) st_mode; s->st_mode = (typeof(s->st_mode)) st_mode;
} }
} }
@ -140,7 +142,7 @@ static void _eject_trailer()
{ {
struct stat s; struct stat s;
memset(&s, 0, sizeof(s)); memset(&s, 0, sizeof(s));
_eject(&s, "TRAILER!!!", 10, 0, 0); _eject(&s, TRAILER, 10, 0, 0);
while(total_size & 0xff) { while(total_size & 0xff) {
total_size++; total_size++;