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

webrtc/test/testsupport/fileutils.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/test/testsupport/fileutils.h"
 
 #include <assert.h>
 
 #ifdef WIN32
 #include <direct.h>
 #include <tchar.h>
 #include <windows.h>
 #include <algorithm>
 
 #include "Shlwapi.h"
 #include "WinDef.h"
 
 #include "webrtc/base/win32.h"
 #define GET_CURRENT_DIR _getcwd
 #else
+#include <dirent.h>
 #include <unistd.h>
 
 #define GET_CURRENT_DIR getcwd
 #endif
 
 #include <sys/stat.h>  // To check for directory existence.
 #ifndef S_ISDIR  // Not defined in stat.h on Windows.
 #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #endif
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <memory>
 
+#include "webrtc/base/checks.h"
 #include "webrtc/typedefs.h"  // For architecture defines
 
 namespace webrtc {
 namespace test {
 
 #if defined(WEBRTC_IOS)
 // Defined in iosfileutils.mm.  No header file to discourage use elsewhere.
 std::string IOSOutputPath();
 std::string IOSRootPath();
 std::string IOSResourcePath(std::string name, std::string extension);
@@ skipping 66 matching lines @@
 }
 
 std::string OutputPath() {
   return kRootDirName;
 }
 
 std::string WorkingDir() {
   return kRootDirName;
 }
 
-#else // WEBRTC_ANDROID
+#else  // WEBRTC_ANDROID
 
 std::string ProjectRootPath() {
 #if defined(WEBRTC_IOS)
   return IOSRootPath();
 #else
   std::string path = WorkingDir();
   if (path == kFallbackPath) {
     return kCannotFindProjectRootDir;
   }
   if (relative_dir_path_set) {
@@ skipping 65 matching lines @@
     assert(false);
     return "";
   } else {
     ::close(fd);
   }
   std::string ret(tempname.get());
   return ret;
 #endif
 }
 
+bool ReadDirectory(std::string path, std::vector<std::string>* output) {
+  RTC_DCHECK(output);
+  if (!DirExists(path)) { return false; }

[nisse-webrtc, 2017/05/29 07:20:40]

I'm not sure what DirExists return for an empty string. Since you index by
|path_len - 1| below, please check explicitly that the string is non-empty.

[AleBzk, 2017/05/29 09:50:51]

Done.

+  output->clear();
+#if defined(WEBRTC_WIN)
+  // Append separator character if needed.
+  size_t path_len = path.length();
+  if (path[path_len - 1] != '\\') { path += '\\'; }

[nisse-webrtc, 2017/05/29 07:20:40]

Use path.back() instead, and delete the |path_len| variable, here and below.
(Non-emptyness check still needed, since path.back() on an empty string is
equally invalid).

[AleBzk, 2017/05/29 09:50:51]

Done.

+
+  // Init.
+  WIN32_FIND_DATA data;
+  HANDLE handle = ::FindFirstFile(rtc::ToUtf16(path + '*').c_str(), &data);
+  if (handle == INVALID_HANDLE_VALUE) { return false; }
+
+  // Populate output.
+  do {
+    const std::string name = rtc::ToUtf8(data.cFileName);
+    if (name != "." && name != "..") { output->emplace_back(path + name); }
+  } while (::FindNextFile(handle, &data) == TRUE);
+
+  // Release resources.
+  if (handle != INVALID_HANDLE_VALUE) { ::FindClose(handle); }
+#else
+  // Append separator character if needed.
+  size_t path_len = path.length();
+  if (path[path_len - 1] != '/') { path += '/'; }
+
+  // Init.
+  DIR *dir = ::opendir(path.c_str());
+  if (dir == nullptr) { return false; }
+  struct dirent* dirent = readdir(dir);
+  if (dirent == nullptr) { return false; }
+  struct stat stat;
+  if (::stat(std::string(path + dirent->d_name).c_str(), &stat) != 0) {

[nisse-webrtc, 2017/05/29 07:20:40]

Unclear to me why you call stat (it would make sense if you wanted to return
files only).

I think the loop would be clearer with only a single call to readdir, instead of
the current organization which seems modeled on the FindFirstFile/FindNextFile
pattern used on windows.

I.e., somthing like

  dir = ::opendir();
  if (!dir) return false;
  while (struct dirent* dirent = readdir(dir)) {
    if (name != "." && name != "..") output->emplace_back(...);
  }

[AleBzk, 2017/05/29 09:50:51]

Right! I just copied and adapted the code from webrtc/base/fileutils.cc. Thanks
:)

+    return false;
+  }
+
+  // Populate output.
+  do {
+    const std::string& name = dirent->d_name;
+    if (name != "." && name != "..") { output->emplace_back(path + name); }
+    dirent = ::readdir(dir);
+    if (dirent == nullptr) { break; }
+  } while (::stat(std::string(path + dirent->d_name).c_str(), &stat) == 0);
+
+  // Release resources.
+  closedir(dir);
+#endif
+  return true;
+}
+
 bool CreateDir(const std::string& directory_name) {
   struct stat path_info = {0};
   // Check if the path exists already:
   if (stat(directory_name.c_str(), &path_info) == 0) {
     if (!S_ISDIR(path_info.st_mode)) {
       fprintf(stderr, "Path %s exists but is not a directory! Remove this "
               "file and re-run to create the directory.\n",
               directory_name.c_str());
       return false;
     }
@@ skipping 75 matching lines @@
     if (fseek(f, 0, SEEK_END) == 0) {
       size = ftell(f);
     }
     fclose(f);
   }
   return size;
 }
 
 }  // namespace test
 }  // namespace webrtc