Delete rtc::Pathname
Bug: webrtc:6424
Change-Id: Iec01dc5dd1426d4558983b828b67af872107d723
Reviewed-on: https://webrtc-review.googlesource.com/c/108400
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#25479}
diff --git a/rtc_base/fileutils.cc b/rtc_base/fileutils.cc
index 0adbbac..1086f3c 100644
--- a/rtc_base/fileutils.cc
+++ b/rtc_base/fileutils.cc
@@ -11,7 +11,6 @@
#include "rtc_base/fileutils.h"
#include "rtc_base/checks.h"
-#include "rtc_base/pathutils.h"
#if defined(WEBRTC_WIN)
#include "rtc_base/stringutils.h" // for ToUtf16
@@ -58,12 +57,12 @@
// Starts traversing a directory.
// dir is the directory to traverse
// returns true if the directory exists and is valid
-bool DirectoryIterator::Iterate(const Pathname& dir) {
- directory_ = dir.pathname();
+bool DirectoryIterator::Iterate(const std::string& dir) {
+ directory_ = dir;
#if defined(WEBRTC_WIN)
if (handle_ != INVALID_HANDLE_VALUE)
::FindClose(handle_);
- std::string d = dir.pathname() + '*';
+ std::string d = dir + '*';
handle_ = ::FindFirstFile(ToUtf16(d).c_str(), &data_);
if (handle_ == INVALID_HANDLE_VALUE)
return false;
@@ -77,7 +76,7 @@
if (dirent_ == nullptr)
return false;
- if (::stat(std::string(directory_ + Name()).c_str(), &stat_) != 0)
+ if (::stat(PathName().c_str(), &stat_) != 0)
return false;
#endif
return true;
@@ -93,7 +92,7 @@
if (dirent_ == nullptr)
return false;
- return ::stat(std::string(directory_ + Name()).c_str(), &stat_) == 0;
+ return ::stat(PathName().c_str(), &stat_) == 0;
#endif
}
@@ -112,7 +111,17 @@
return ToUtf8(data_.cFileName);
#else
RTC_DCHECK(dirent_);
- return dirent_->d_name;
+ return std::string(dirent_->d_name);
+#endif
+}
+
+// returns the name of the file currently pointed to
+std::string DirectoryIterator::PathName() const {
+#if defined(WEBRTC_WIN)
+ return directory_ + "\\" + ToUtf8(data_.cFileName);
+#else
+ RTC_DCHECK(dirent_);
+ return directory_ + "/" + dirent_->d_name;
#endif
}