Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(49)

Unified Diff: webrtc/test/testsupport/fileutils.cc

Issue 2898753002: ReadDirectory() added in webrtc/test/testsupport/fileutils.h (Closed)
Patch Set: final changes and win trybot fix gtest Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/test/testsupport/fileutils.h ('k') | webrtc/test/testsupport/fileutils_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/testsupport/fileutils.cc
diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
index 02ef06580bbcec4203d46ac1c23f42d4e279ebd6..a96b1eaf0211d47c10582117dad9820a03ded65f 100644
--- a/webrtc/test/testsupport/fileutils.cc
+++ b/webrtc/test/testsupport/fileutils.cc
@@ -24,6 +24,7 @@
#include "webrtc/base/win32.h"
#define GET_CURRENT_DIR _getcwd
#else
+#include <dirent.h>
#include <unistd.h>
#define GET_CURRENT_DIR getcwd
@@ -39,7 +40,9 @@
#include <string.h>
#include <memory>
+#include <utility>
+#include "webrtc/base/checks.h"
#include "webrtc/typedefs.h" // For architecture defines
namespace webrtc {
@@ -126,7 +129,7 @@ std::string WorkingDir() {
return kRootDirName;
}
-#else // WEBRTC_ANDROID
+#else // WEBRTC_ANDROID
std::string ProjectRootPath() {
#if defined(WEBRTC_IOS)
@@ -212,6 +215,57 @@ std::string TempFilename(const std::string &dir, const std::string &prefix) {
#endif
}
+rtc::Optional<std::vector<std::string>> ReadDirectory(std::string path) {
+ if (path.length() == 0)
+ return rtc::Optional<std::vector<std::string>>();
+
+#if defined(WEBRTC_WIN)
+ // Append separator character if needed.
+ if (path.back() != '\\')
+ path += '\\';
+
+ // Init.
+ WIN32_FIND_DATA data;
+ HANDLE handle = ::FindFirstFile(rtc::ToUtf16(path + '*').c_str(), &data);
+ if (handle == INVALID_HANDLE_VALUE)
+ return rtc::Optional<std::vector<std::string>>();
+
+ // Populate output.
+ std::vector<std::string> found_entries;
+ do {
+ const std::string name = rtc::ToUtf8(data.cFileName);
+ if (name != "." && name != "..")
+ found_entries.emplace_back(path + name);
+ } while (::FindNextFile(handle, &data) == TRUE);
+
+ // Release resources.
+ if (handle != INVALID_HANDLE_VALUE)
+ ::FindClose(handle);
+#else
+ // Append separator character if needed.
+ if (path.back() != '/')
+ path += '/';
+
+ // Init.
+ DIR* dir = ::opendir(path.c_str());
+ if (dir == nullptr)
+ return rtc::Optional<std::vector<std::string>>();
+
+ // Populate output.
+ std::vector<std::string> found_entries;
+ while (dirent* dirent = readdir(dir)) {
+ const std::string& name = dirent->d_name;
+ if (name != "." && name != "..")
+ found_entries.emplace_back(path + name);
+ }
+
+ // Release resources.
+ closedir(dir);
+#endif
+
+ return rtc::Optional<std::vector<std::string>>(std::move(found_entries));
+}
+
bool CreateDir(const std::string& directory_name) {
struct stat path_info = {0};
// Check if the path exists already:
« no previous file with comments | « webrtc/test/testsupport/fileutils.h ('k') | webrtc/test/testsupport/fileutils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698