Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c10c31e8 authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge "adb: allow symlinks to directories in directory_exists."

parents d13099e6 ff468dce

adb/adb_utils.cpp

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ bool getcwd(std::string* s) { 


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

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ TEST(adb_utils, directory_exists) { 
  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

}