commit 3d994f1998c8f2efc2c8f5744615e92661bde46f Author: Jonathan Wakely Date: Tue Mar 21 12:29:08 2023 libstdc++: Make std::filesystem::copy_file work for procfs [PR108178] The size reported by stat is always zero for some special files such as those under /proc, which means the current copy_file implementation thinks there is nothing to copy. Instead of trusting the stat value, try to read a character from a streambuf and check for EOF. libstdc++-v3/ChangeLog: PR libstdc++/108178 * src/filesystem/ops-common.h (do_copy_file): Check for empty files by trying to read a character. * testsuite/27_io/filesystem/operations/copy_file_108178.cc: New test. diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index 906436b484e..a28cbeb10b5 100644 --- a/libstdc++-v3/src/filesystem/ops-common.h +++ b/libstdc++-v3/src/filesystem/ops-common.h @@ -618,11 +618,16 @@ _GLIBCXX_BEGIN_NAMESPACE_FILESYSTEM if (sbout.is_open()) out.fd = -1; - if (from_st->st_size && !(std::ostream(&sbout) << &sbin)) - { - ec = std::make_error_code(std::errc::io_error); - return false; - } + // ostream::operator<<(streambuf*) fails if it extracts no characters, + // so don't try to use it for empty files. But from_st->st_size == 0 for + // some special files (e.g. procfs, see PR libstdc++/108178) so just try + // to read a character to decide whether there is anything to copy or not. + if (sbin.sgetc() != char_traits::eof()) + if (!(std::ostream(&sbout) << &sbin)) + { + ec = std::make_error_code(std::errc::io_error); + return false; + } if (!sbout.close() || !sbin.close()) { diff --git a/libstdc++-v3/testsuite/27_io/filesystem/operations/copy_file_108178.cc b/libstdc++-v3/testsuite/27_io/filesystem/operations/copy_file_108178.cc new file mode 100644 index 00000000000..25135834e21 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/filesystem/operations/copy_file_108178.cc @@ -0,0 +1,33 @@ +// { dg-do run { target c++17 } } +// { dg-require-filesystem-ts "" } + +// C++17 30.10.15.4 Copy [fs.op.copy_file] + +#include +#include +#include // getpid +#include +#include + +namespace fs = std::filesystem; + +void +test_procfs() // PR libstdc++/108178 +{ + auto pid = ::getpid(); + std::string from = "/proc/" + std::to_string(pid) + "/status"; + if (fs::exists(from)) + { + auto to = __gnu_test::nonexistent_path(); + fs::copy_file(from, to); + std::ifstream f(to); + VERIFY(f.is_open()); + VERIFY(f.peek() != std::char_traits::eof()); + fs::remove(to); + } +} + +int main() +{ + test_procfs(); +}