tequilaOS/platform_system_core
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "libcutils: fs_config: target_out_path assumed /system"" am: ad90763ab9 am: bb1c8f3691

Browse source 
am: b00ea15291

Change-Id: If19838bebcf272599acd8d31b27c1cb6672bdba4
This commit is contained in:
Thierry Strudel 2017-04-07 02:16:59 +00:00 committed by android-build-merger
commit 9c2029b1d0
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
libcutils/fs_config.c
View file

@ -232,20 +232,16 @@ static int fs_config_open(int dir, int which, const char* target_out_path) {
if (target_out_path && *target_out_path) {
/* target_out_path is the path to the directory holding content of
* system partition but as we cannot guarantee it ends with '/system'
* or a trailing slash or not, we need to strip them off. */
* system partition but as we cannot guaranty it ends with '/system'
* we need this below skip_len logic */
char* name = NULL;
int target_out_path_len = strlen(target_out_path);
int skip_len = strlen("/system");
while ((target_out_path_len > 0) &&
(target_out_path[target_out_path_len - strlen("/")] == '/')) {
--target_out_path_len;
if (target_out_path[target_out_path_len] == '/') {
skip_len++;
}
if ((target_out_path_len >= (int)strlen("/system")) &&
!strcmp(target_out_path + target_out_path_len - strlen("/system"), "/system")) {
target_out_path_len -= strlen("/system");
}
if (asprintf(&name, "%.*s%s", target_out_path_len, target_out_path, conf[which][dir]) != -1) {
if (asprintf(&name, "%s%s", target_out_path, conf[which][dir] + skip_len) != -1) {
fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_BINARY));
free(name);
}