ReadDirectory() added in webrtc/test/testsupport/fileutils.h

webrtc/test/testsupport/fileutils.cc

Index: webrtc/test/testsupport/fileutils.cc
diff --git a/webrtc/test/testsupport/fileutils.cc b/webrtc/test/testsupport/fileutils.cc
index 02ef06580bbcec4203d46ac1c23f42d4e279ebd6..1d88b4fd8a6842242a6f6dac327d09a08895d3ce 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
@@ -40,6 +41,7 @@
 
 #include <memory>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/typedefs.h"  // For architecture defines
 
 namespace webrtc {
@@ -76,6 +78,58 @@ const char* kResourcesDirName = "resources";
 char relative_dir_path[FILENAME_MAX];
 bool relative_dir_path_set = false;
 
+#ifdef WIN32
+rtc::Optional<std::vector<std::string>> ReadDirectoryWin(std::string path) {
+  // 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);
+
+  return rtc::Optional<std::vector<std::string>>(std::move(found_entries));
+}
+#else
+rtc::Optional<std::vector<std::string>> ReadDirectoryNotWin(std::string path) {
+  // 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);
+
+  return rtc::Optional<std::vector<std::string>>(std::move(found_entries));
+}
+#endif
+
 }  // namespace
 
 const char* kCannotFindProjectRootDir = "ERROR_CANNOT_FIND_PROJECT_ROOT_DIR";
@@ -126,7 +180,7 @@ std::string WorkingDir() {
   return kRootDirName;
 }
 
-#else // WEBRTC_ANDROID
+#else  // WEBRTC_ANDROID
 
 std::string ProjectRootPath() {
 #if defined(WEBRTC_IOS)
@@ -212,6 +266,16 @@ std::string TempFilename(const std::string &dir, const std::string &prefix) {
 #endif
 }
 
+rtc::Optional<std::vector<std::string>> ReadDirectory(const std::string& path) {
+  if (path.length() == 0)
+    return rtc::Optional<std::vector<std::string>>();
+#if defined(WEBRTC_WIN)
+  return ReadDirectoryWin(path);

[nisse-webrtc, 2017/05/30 12:18:53]

To me, it was more readable with the windows and non-windows versions inlined
here.

[kwiberg-webrtc, 2017/05/30 12:37:00]

Really? I generally find that readability is hurt a lot when #ifdefs slice a
scope in half.

[nisse-webrtc, 2017/05/30 12:55:25]

At least in this case, when there's clearly two separate implementations, each
only a dozen lines. And I don't like the FooWin and FooNoWin names, for a couple
of reasons.

I'd say, either use the pattern

#ifdef WIN32  // BTW, should it be WEBRTC_WIN?
rtc::Optional<std::vector<std::string>> ReadDirectory(const std::string& path) {
...
}
#else
rtc::Optional<std::vector<std::string>> ReadDirectory(const std::string& path) {
...
}
#endif

using a single function name, and accept a small amount of code duplication. Or

rtc::Optional<std::vector<std::string>> ReadDirectory(const std::string& path) {
  if (path.empty()) ...

  std::vector<...> entries;
#if WIN32
...
#else
...
#endif
  return rtc::Optional<...>(std::move(entries));
}

with some common code collected at the beginning and end of the function body.

+#else
+  return ReadDirectoryNotWin(path);
+#endif
+}
+
 bool CreateDir(const std::string& directory_name) {
   struct stat path_info = {0};
   // Check if the path exists already: