Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 23 additions & 8 deletions cppwinrt/text_writer.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,26 @@ namespace cppwinrt
{
inline std::string file_to_string(std::string const& filename)
{
std::ifstream file(filename, std::ios::binary);
return static_cast<std::stringstream const&>(std::stringstream() << file.rdbuf()).str();
std::ifstream file(filename, std::ios::binary | std::ios::ate);
if (!file) { return{}; }

const auto stream_size = file.tellg();
if (stream_size == std::ifstream::pos_type(-1))
{
return {};
}

file.seekg(0);

auto size = static_cast<std::size_t>(stream_size);
std::string result(size, '\0');
file.read(result.data(), size);
if (!file)
{
result.resize(static_cast<std::size_t>(file.gcount()));
}

return result;
Comment thread
DefaultRyan marked this conversation as resolved.
}

template <typename T>
Expand Down Expand Up @@ -218,18 +236,15 @@ namespace cppwinrt

bool file_equal(std::string const& filename) const
{
if (!std::filesystem::exists(filename))
// Non-throwing file_size returns uintmax_t(-1) on errors, which shouldn't ever be the size of m_first or m_second
std::error_code ec;
if (std::filesystem::file_size(filename, ec) != m_first.size() + m_second.size())
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be

const auto size{ std::filesystem::file_size(filename, ec) };
if (ec || (size != m_first.size() + m_second.size())

?

https://en.cppreference.com/cpp/filesystem/file_size
(see code at bottom of Example)

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not needed, the non throwing overload returns -1 on error, which will make the comparison fail.

{
return false;
}

auto file = file_to_string(filename);

if (file.size() != m_first.size() + m_second.size())
{
return false;
}

if (!std::equal(m_first.begin(), m_first.end(), file.begin(), file.begin() + m_first.size()))
{
return false;
Expand Down
Loading