Skip to content
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

Jump to bottom

[vcpkg] implement copy_symlink working for non-elevated processes #12400

Merged
merged 14 commits into from
Jul 15, 2020
Merged

[vcpkg] implement copy_symlink working for non-elevated processes #12400

Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1bc0d2c
[vcpkg] implement copy_symlink working for non-elevated processes
Maximus5 Jul 13, 2020
108ae60
[vcpkg] read_symlink Windows implementation
Maximus5 Jul 14, 2020
f7bbc5f
[vcpkg] normalize_path on Windows only
Maximus5 Jul 14, 2020
a579898
Update toolsrc/src/vcpkg/base/files.cpp
Maximus5 Jul 14, 2020
e2f05a2
Update toolsrc/src/vcpkg/base/files.cpp
Maximus5 Jul 14, 2020
b548fb4
Update toolsrc/src/vcpkg/base/files.cpp
Maximus5 Jul 14, 2020
04a0978
remove normalization
Maximus5 Jul 14, 2020
4a20d10
Update toolsrc/src/vcpkg/base/files.cpp
Maximus5 Jul 14, 2020
9420093
Update toolsrc/src/vcpkg/base/files.cpp
Maximus5 Jul 14, 2020
1c13352
Update toolsrc/src/vcpkg/base/files.cpp
Maximus5 Jul 14, 2020
738778e
Update toolsrc/src/vcpkg/base/files.cpp
Maximus5 Jul 14, 2020
7dfb7ca
Update toolsrc/src/vcpkg/base/files.cpp
Maximus5 Jul 14, 2020
db575c6
use unique_ptr
Maximus5 Jul 14, 2020
7eb578f
comments
Maximus5 Jul 14, 2020
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
57 changes: 56 additions & 1 deletion toolsrc/src/vcpkg/base/files.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,61 @@ namespace vcpkg::Files
return status_implementation(false, p, ec);
}

fs::path read_symlink_implementation(const fs::path& oldpath, std::error_code& ec)
{
#if defined(_WIN32) && !VCPKG_USE_STD_FILESYSTEM
Maximus5 marked this conversation as resolved.
Show resolved Hide resolved
ec.clear();
auto handle = CreateFileW(oldpath.c_str(),
0, // open just the metadata
FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
nullptr /* no security attributes */,
OPEN_EXISTING,
FILE_ATTRIBUTE_NORMAL,
nullptr /* no template file */);
if (handle == INVALID_HANDLE_VALUE)
{
ec.assign(GetLastError(), std::system_category());
return oldpath;
}
fs::path target;
const DWORD maxsize = 32768;
const std::unique_ptr<wchar_t[]> buffer(new wchar_t[maxsize]);
const auto rc = GetFinalPathNameByHandleW(handle, buffer.get(), maxsize, 0);
if (rc > 0 && rc < maxsize)
{
target = buffer.get();
}
else
{
ec.assign(GetLastError(), std::system_category());
}
CloseHandle(handle);
return target;
#else // ^^^ defined(_WIN32) && !VCPKG_USE_STD_FILESYSTEM // !defined(_WIN32) || VCPKG_USE_STD_FILESYSTEM vvv
return fs::stdfs::read_symlink(oldpath, ec);
#endif // ^^^ !defined(_WIN32) || VCPKG_USE_STD_FILESYSTEM
}

void copy_symlink_implementation(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec)
{
#if defined(_WIN32) && !VCPKG_USE_STD_FILESYSTEM
const auto target = read_symlink_implementation(oldpath, ec);
if (ec) return;

const DWORD flags = SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
if (!CreateSymbolicLinkW(newpath.c_str(), target.c_str(), flags))
{
const auto err = GetLastError();
ec.assign(err, std::system_category());
return;
}
ec.clear();
return;
#else // ^^^ defined(_WIN32) && !VCPKG_USE_STD_FILESYSTEM // !defined(_WIN32) || VCPKG_USE_STD_FILESYSTEM vvv
return fs::stdfs::copy_symlink(oldpath, newpath, ec);
#endif // ^^^ !defined(_WIN32) || VCPKG_USE_STD_FILESYSTEM
}

// does _not_ follow symlinks
void set_writeable(const fs::path& path, std::error_code& ec) noexcept
{
Expand Down Expand Up @@ -799,7 +854,7 @@ namespace vcpkg::Files
}
virtual void copy_symlink(const fs::path& oldpath, const fs::path& newpath, std::error_code& ec) override
{
return fs::stdfs::copy_symlink(oldpath, newpath, ec);
return Files::copy_symlink_implementation(oldpath, newpath, ec);
}

virtual fs::file_status status(const fs::path& path, std::error_code& ec) const override
Expand Down