GitHub-Proxy/filesystem
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/gulrak/filesystem synced 2025-06-04 11:13:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-146-added-EINTR-handling'

Browse Source
This commit is contained in:
Steffen Schuemann 2023-03-04 16:39:33 +01:00
commit 61176cd82a
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
include/ghc/filesystem.hpp
View File

@ -3986,14 +3986,24 @@ GHC_INLINE bool copy_file(const path& from, const path& to, copy_options options
} }
} }
ssize_t br, bw; ssize_t br, bw;
while ((br = ::read(in, buffer.data(), buffer.size())) > 0) { while (true) {
do { br = ::read(in, buffer.data(), buffer.size()); } while(errno == EINTR);
if(!br) {
break;
}
if(br < 0) {
ec = detail::make_system_error();
::close(in);
::close(out);
return false;
}
ssize_t offset = 0; ssize_t offset = 0;
do { do {
if ((bw = ::write(out, buffer.data() + offset, static_cast<size_t>(br))) > 0) { if ((bw = ::write(out, buffer.data() + offset, static_cast<size_t>(br))) > 0) {
br -= bw; br -= bw;
offset += bw; offset += bw;
} }
else if (bw < 0) { else if (bw < 0 && errno != EINTR) {
ec = detail::make_system_error(); ec = detail::make_system_error();
::close(in); ::close(in);
::close(out); ::close(out);
@ -5694,7 +5704,7 @@ public:
, _entry(nullptr) , _entry(nullptr)
{ {
if (!path.empty()) { if (!path.empty()) {
_dir = ::opendir(path.native().c_str()); do { _dir = ::opendir(path.native().c_str()); } while(errno == EINTR);
if (!_dir) { if (!_dir) {
auto error = errno; auto error = errno;
_base = filesystem::path(); _base = filesystem::path();
@ -5721,7 +5731,7 @@ public:
do { do {
skip = false; skip = false;
errno = 0; errno = 0;
_entry = ::readdir(_dir); do { _entry = ::readdir(_dir); } while(errno == EINTR);
if (_entry) { if (_entry) {
_dir_entry._path = _base; _dir_entry._path = _base;
_dir_entry._path.append_name(_entry->d_name); _dir_entry._path.append_name(_entry->d_name);
@ -5735,7 +5745,7 @@ public:
::closedir(_dir); ::closedir(_dir);
_dir = nullptr; _dir = nullptr;
_dir_entry._path.clear(); _dir_entry._path.clear();
if (errno) { if (errno && errno != EINTR) {
ec = detail::make_system_error(); ec = detail::make_system_error();
} }
break; break;