ScoopDroid/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: c10c31e8ba

Change-Id: I9480b98081f9db54955da19a4565c9a458781cdb
This commit is contained in:
Josh Gao 2017-03-24 18:43:23 +00:00 • committed by android-build-merger
commit 36699d3fb2
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
adb/adb_utils.cpp
View file

@ -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) {

1
adb/adb_utils_test.cpp
View file

@ -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
}