mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-07 22:30:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmSystemTools: Provide quiet link creation methods

Browse Source 
Offer variants that let the caller handle error messages.
This commit is contained in:
Brad King
2022-10-06 13:44:27 -04:00
parent 2133cf2c8e
commit aba48bd6ac
4 changed files with 50 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Source/cmFileCommand.cxx
View File

@@ -2960,11 +2960,23 @@ bool HandleCreateLinkCommand(std::vector<std::string> const& args,
// Check if the command requires a symbolic link.
if (arguments.Symbolic) {
completed = static_cast<bool>(
cmSystemTools::CreateSymlink(fileName, newFileName, &result));
cmsys::Status linked =
cmSystemTools::CreateSymlinkQuietly(fileName, newFileName);
if (linked) {
completed = true;
} else {
result = cmStrCat("failed to create symbolic link '", newFileName,
"': ", linked.GetString());
}
} else {
completed = static_cast<bool>(
cmSystemTools::CreateLink(fileName, newFileName, &result));
cmsys::Status linked =
cmSystemTools::CreateLinkQuietly(fileName, newFileName);
if (linked) {
completed = true;
} else {
result = cmStrCat("failed to create link '", newFileName,
"': ", linked.GetString());
}
}
// Check if copy-on-error is enabled in the arguments.

43
Source/cmSystemTools.cxx
View File

@@ -3590,8 +3590,19 @@ std::string cmSystemTools::EncodeURL(std::string const& in, bool escapeSlashes)
}
cmsys::Status cmSystemTools::CreateSymlink(std::string const& origName,
std::string const& newName,
std::string* errorMessage)
std::string const& newName)
{
cmsys::Status status =
cmSystemTools::CreateSymlinkQuietly(origName, newName);
if (!status) {
cmSystemTools::Error(cmStrCat("failed to create symbolic link '", newName,
"': ", status.GetString()));
}
return status;
}
cmsys::Status cmSystemTools::CreateSymlinkQuietly(std::string const& origName,
std::string const& newName)
{
uv_fs_t req;
int flags = 0;
@@ -3611,20 +3622,23 @@ cmsys::Status cmSystemTools::CreateSymlink(std::string const& origName,
#else
status = cmsys::Status::POSIX(-err);
#endif
std::string e = cmStrCat("failed to create symbolic link '", newName,
"': ", status.GetString());
if (errorMessage) {
*errorMessage = std::move(e);
} else {
cmSystemTools::Error(e);
}
}
return status;
}
cmsys::Status cmSystemTools::CreateLink(std::string const& origName,
std::string const& newName,
std::string* errorMessage)
std::string const& newName)
{
cmsys::Status status = cmSystemTools::CreateLinkQuietly(origName, newName);
if (!status) {
cmSystemTools::Error(
cmStrCat("failed to create link '", newName, "': ", status.GetString()));
}
return status;
}
cmsys::Status cmSystemTools::CreateLinkQuietly(std::string const& origName,
std::string const& newName)
{
uv_fs_t req;
int err =
@@ -3638,13 +3652,6 @@ cmsys::Status cmSystemTools::CreateLink(std::string const& origName,
#else
status = cmsys::Status::POSIX(-err);
#endif
std::string e =
cmStrCat("failed to create link '", newName, "': ", status.GetString());
if (errorMessage) {
*errorMessage = std::move(e);
} else {
cmSystemTools::Error(e);
}
}
return status;
}

10
Source/cmSystemTools.h
View File

@@ -595,14 +595,16 @@ public:
/** Create a symbolic link if the platform supports it. Returns whether
creation succeeded. */
static cmsys::Status CreateSymlink(std::string const& origName,
std::string const& newName,
std::string* errorMessage = nullptr);
std::string const& newName);
static cmsys::Status CreateSymlinkQuietly(std::string const& origName,
std::string const& newName);
/** Create a hard link if the platform supports it. Returns whether
creation succeeded. */
static cmsys::Status CreateLink(std::string const& origName,
std::string const& newName,
std::string* errorMessage = nullptr);
std::string const& newName);
static cmsys::Status CreateLinkQuietly(std::string const& origName,
std::string const& newName);
/** Get the system name. */
static cm::string_view GetSystemName();

7
Source/cmcmd.cxx
View File

@@ -1700,16 +1700,15 @@ cmsys::Status cmcmd::SymlinkInternal(std::string const& file,
}
std::string linktext = cmSystemTools::GetFilenameName(file);
#if defined(_WIN32) && !defined(__CYGWIN__)
std::string errorMessage;
cmsys::Status status =
cmSystemTools::CreateSymlink(linktext, link, &errorMessage);
cmsys::Status status = cmSystemTools::CreateSymlinkQuietly(linktext, link);
// Creating a symlink will fail with ERROR_PRIVILEGE_NOT_HELD if the user
// does not have SeCreateSymbolicLinkPrivilege, or if developer mode is not
// active. In that case, we try to copy the file.
if (status.GetWindows() == ERROR_PRIVILEGE_NOT_HELD) {
status = cmSystemTools::CopyFileAlways(file, link);
} else if (!status) {
cmSystemTools::Error(errorMessage);
cmSystemTools::Error(cmStrCat("failed to create symbolic link '", link,
"': ", status.GetString()));
}
return status;
#else