diff options
author | Jonathan Wakely <jwakely@redhat.com> | 2023-03-21 12:29:08 +0000 |
---|---|---|
committer | Jonathan Wakely <jwakely@redhat.com> | 2023-06-06 12:31:57 +0100 |
commit | 07a0e108247f23fcb919c61595adae143f1ea02a (patch) | |
tree | 04a66d00d13fde60fd8c4e6c76a7c3bddd8e7c5b | |
parent | d87caacf8e2df563afda85f3a5b7b852e08b6b2c (diff) | |
download | gcc-07a0e108247f23fcb919c61595adae143f1ea02a.zip gcc-07a0e108247f23fcb919c61595adae143f1ea02a.tar.gz gcc-07a0e108247f23fcb919c61595adae143f1ea02a.tar.bz2 |
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.
-rw-r--r-- | libstdc++-v3/src/filesystem/ops-common.h | 15 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/27_io/filesystem/operations/copy_file_108178.cc | 33 |
2 files changed, 43 insertions, 5 deletions
diff --git a/libstdc++-v3/src/filesystem/ops-common.h b/libstdc++-v3/src/filesystem/ops-common.h index 7c8d3a6..901f166 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<char>::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 0000000..2513583 --- /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 <filesystem> +#include <fstream> +#include <unistd.h> // getpid +#include <testsuite_fs.h> +#include <testsuite_hooks.h> + +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<char>::eof()); + fs::remove(to); + } +} + +int main() +{ + test_procfs(); +} |