commit d9f2082fd798e77cc15735bc582507abb64c8ed4
author Nick Kralevich <nnk@google.com> Fri Feb 06 17:11:00 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 06 17:11:00 2015 +0000
tree 22d9c8a6fd90f78dd6f120324085e22ef0969d60
parent f805a8b3a917b163c789f1ad4b272560f98eb6f1
parent 25e581a11c2752a9fe857c4859469f367d53f35e

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

VolumeManager.cpp

diff --git a/VolumeManager.cpp b/VolumeManager.cpp
index a41e583..4c5bb58 100644
--- a/VolumeManager.cpp
+++ b/VolumeManager.cpp
@@ -1203,14 +1203,12 @@
     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);