commit 442f1ab3fc5086193fcf3e99b3c2ab94e166d9b0
author Josh Gao <jmgao@google.com> Fri Mar 24 18:45:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 24 18:45:23 2017 +0000
tree 04590e2015a8a9f8de90665662b8529f5f8919e5
parent 9adbaf55e4d237185821d31c937343c3168c5cdb
parent ca983e10fb810b42d279e1e36f847d45be15ded8

Merge "adb: allow symlinks to directories in directory_exists." am: c10c31e8ba
am: 36699d3fb2

Change-Id: If5d4ad7ee69be834f58788d823758cf230f51fdc

adb/adb_utils.cpp

diff --git a/adb/adb_utils.cpp b/adb/adb_utils.cpp
index 7058acb..31d3dc6 100644
--- a/adb/adb_utils.cpp
+++ b/adb/adb_utils.cpp
@@ -75,7 +75,7 @@
 
 bool directory_exists(const std::string& path) {
   struct stat sb;
-  return lstat(path.c_str(), &sb) != -1 && S_ISDIR(sb.st_mode);
+  return stat(path.c_str(), &sb) != -1 && S_ISDIR(sb.st_mode);
 }
 
 std::string escape_arg(const std::string& s) {

adb/adb_utils_test.cpp

diff --git a/adb/adb_utils_test.cpp b/adb/adb_utils_test.cpp
index a3bc445..e1b6287 100644
--- a/adb/adb_utils_test.cpp
+++ b/adb/adb_utils_test.cpp
@@ -55,7 +55,6 @@
   ASSERT_FALSE(directory_exists(subdir(profiles_dir, "does-not-exist")));
 #else
   ASSERT_TRUE(directory_exists("/proc"));
-  ASSERT_FALSE(directory_exists("/proc/self")); // Symbolic link.
   ASSERT_FALSE(directory_exists("/proc/does-not-exist"));
 #endif
 }