Merge branch 'master' of github.com:gulrak/filesystem

This commit is contained in:
Steffen Schuemann 2019-05-23 08:39:16 +02:00
commit 962df76d10

View File

@ -3118,7 +3118,7 @@ GHC_INLINE bool copy_file(const path& from, const path& to, copy_options options
ec = std::error_code(errno, std::system_category());
return false;
}
std::shared_ptr<void> guard_out(nullptr, [out](void*) { ::close(out); });
std::shared_ptr<void> guard_in(nullptr, [in](void*) { ::close(in); });
int mode = O_CREAT | O_WRONLY | O_TRUNC;
if (!overwrite) {
mode |= O_EXCL;
@ -3127,7 +3127,7 @@ GHC_INLINE bool copy_file(const path& from, const path& to, copy_options options
ec = std::error_code(errno, std::system_category());
return false;
}
std::shared_ptr<void> guard_in(nullptr, [in](void*) { ::close(in); });
std::shared_ptr<void> guard_out(nullptr, [out](void*) { ::close(out); });
ssize_t br, bw;
while ((br = ::read(in, buffer.data(), buffer.size())) > 0) {
int offset = 0;