Skip to content
Merged
Show file tree
Hide file tree
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
25 changes: 17 additions & 8 deletions src/lang/io/include/sourcemeta/core/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,13 @@
#include <sourcemeta/core/io_temporary.h>
// NOLINTEND(misc-include-cleaner)

#include <filesystem> // std::filesystem
#include <fstream> // std::basic_ifstream
#include <iostream> // std::cin
#include <istream> // std::basic_istream
#include <sstream> // std::basic_ostringstream
#include <string> // std::basic_string, std::char_traits, std::string
#include <filesystem> // std::filesystem
#include <fstream> // std::basic_ifstream
#include <iostream> // std::cin
#include <istream> // std::basic_istream
#include <sstream> // std::basic_ostringstream
#include <string> // std::basic_string, std::char_traits, std::string
#include <system_error> // std::error_code

/// @defgroup io I/O
/// @brief A growing collection of I/O utilities
Expand Down Expand Up @@ -168,9 +169,17 @@ auto read_file_to_string(const std::filesystem::path &path)

stream.exceptions(std::basic_ifstream<CharT, Traits>::badbit);

// `file_size` only works on regular files, so when it cannot determine a
// size (FIFOs from process substitution, sockets, pipes, or any other
// stat failure) fall back to a streaming read on the already-open stream.
std::error_code file_size_error;
const auto size{std::filesystem::file_size(canonical_path, file_size_error)};
if (file_size_error) {
Comment thread
jviotti marked this conversation as resolved.
return read_to_string<CharT, Traits>(stream);
}

std::basic_string<CharT, Traits> result;
result.resize(
static_cast<std::size_t>(std::filesystem::file_size(canonical_path)));
result.resize(static_cast<std::size_t>(size));
stream.read(result.data(), static_cast<std::streamsize>(result.size()));
// Text-mode reads may return fewer characters than the byte count
// (i.e. CRLF collapses to LF on Windows), so trim to actual.
Expand Down
31 changes: 31 additions & 0 deletions test/io/io_read_to_string_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
#include <sstream> // std::istringstream
#include <string> // std::string

#if !defined(_WIN32)
#include <sys/stat.h> // mkfifo, S_IRUSR, S_IWUSR
#include <thread> // std::thread
#endif

TEST(IO_read_to_string, empty_stream) {
std::istringstream stream{""};
EXPECT_EQ(sourcemeta::core::read_to_string(stream), "");
Expand Down Expand Up @@ -98,3 +103,29 @@ TEST_F(IOReadFileToStringTest, empty_file) {
std::ofstream{path};
EXPECT_EQ(sourcemeta::core::read_file_to_string(path), "");
}

#if !defined(_WIN32)
TEST_F(IOReadFileToStringTest, fifo) {
struct ThreadJoiner {
std::thread &thread;
~ThreadJoiner() {
if (thread.joinable()) {
thread.join();
}
}
};

const auto path{this->workspace / "fifo"};
std::filesystem::remove(path);
ASSERT_EQ(::mkfifo(path.c_str(), S_IRUSR | S_IWUSR), 0);
std::thread writer{[&path]() {
std::ofstream stream{path};
stream << "piped payload\nsecond line\n";
}};
ThreadJoiner joiner{writer};
auto contents{sourcemeta::core::read_file_to_string(path)};
contents.erase(std::remove(contents.begin(), contents.end(), '\r'),
contents.end());
EXPECT_EQ(contents, "piped payload\nsecond line\n");
}
#endif
Loading