Skip to content

Use Linux copy logic for macOS #6506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbezault merged 8 commits into from
May 20, 2019
Merged

Use Linux copy logic for macOS #6506

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6d4df47
Use Linux copy logic for macOS
cbezault May 17, 2019
cc3473a
Use linux headers for macOS
cbezault May 17, 2019
8c73264
Use correct headers on macOS
cbezault May 17, 2019
cf3c271
Use macOS sendfile API correctly
cbezault May 17, 2019
312fb43
Use macOS API not FreeBSD
cbezault May 17, 2019
0fc0634
print error message
cbezault May 17, 2019
6f08d19
Use fcopyfile instead of sendfile on macOS, as of 10.5 a restriction …
cbezault May 17, 2019
0590f71
close file descriptors if sendfile of fcopyfile fails
cbezault May 17, 2019
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: 21 additions & 4 deletions toolsrc/src/vcpkg/base/files.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,17 @@
#include <vcpkg/base/system.process.h>
#include <vcpkg/base/util.h>

#if defined(__linux__)
#if defined(__linux__) || defined(__APPLE__)
#include <fcntl.h>
#include <sys/sendfile.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
#include <string.h>
#endif
#if defined(__linux__)
#include <sys/sendfile.h>
#elif defined(__APPLE__)
#include <copyfile.h>
#endif

namespace vcpkg::Files
Expand Down Expand Up @@ -166,7 +171,7 @@ namespace vcpkg::Files
std::error_code& ec) override
{
this->rename(oldpath, newpath, ec);
#if defined(__linux__)
#if defined(__linux__) || defined(__APPLE__)
if (ec)
{
auto dst = newpath;
Expand All @@ -182,13 +187,25 @@ namespace vcpkg::Files
return;
}

#if defined(__linux__)
off_t bytes = 0;
struct stat info = {0};
fstat(i_fd, &info);
auto written_bytes = sendfile(o_fd, i_fd, &bytes, info.st_size);
#elif defined(__APPLE__)
auto written_bytes = fcopyfile(i_fd, o_fd, 0, COPYFILE_ALL);
#endif
if (written_bytes == -1)
{
ec.assign(errno, std::generic_category());
close(i_fd);
close(o_fd);

return;
}

close(i_fd);
close(o_fd);
if (written_bytes == -1) return;

this->rename(dst, newpath, ec);
if (ec) return;
Expand Down