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

Merge "VolumeManager: don't use faccessat(AT_SYMLINK_NOFOLLOW)"

Browse source
This commit is contained in:
Nick Kralevich 2015-02-06 17:11:00 +00:00 committed by Gerrit Code Review
commit d9f2082fd7
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
VolumeManager.cpp
View file

@ -1203,14 +1203,12 @@ bool VolumeManager::isAsecInDirectory(const char *dir, const char *asecName) con
int dirfd = open(dir, O_DIRECTORY);
if (dirfd < 0) {
SLOGE("Couldn't open internal ASEC dir (%s)", strerror(errno));
return -1;
return false;
}
bool ret = false;
if (!faccessat(dirfd, asecName, F_OK, AT_SYMLINK_NOFOLLOW)) {
ret = true;
}
struct stat sb;
bool ret = (fstatat(dirfd, asecName, &sb, AT_SYMLINK_NOFOLLOW) == 0)
&& S_ISREG(sb.st_mode);
close(dirfd);