mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 10:48:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

file(WRITE): Avoid toggling permissions between 644 and 664

Browse Source 
On systems with umask 022, this function would set permissions
to 664 and restore them to 644 at the end, every single time it was
called (which is many times on e.g. install_manifest.txt).

The intent of the code was to make non-writable files temporarily
writable and to restore permissions in the end, but really, if it's
already user-writable there's no point in toggling this back and forth.
This commit is contained in:
David Faure
2018-08-01 11:32:30 +02:00
committed by Brad King
parent f0e82ce9a2
commit bdd0174df1
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmWriteFileCommand.cxx
View File

@@ -45,16 +45,20 @@ bool cmWriteFileCommand::InitialPass(std::vector<std::string> const& args,
cmSystemTools::MakeDirectory(dir);
mode_t mode = 0;
bool writable = false;
// Set permissions to writable
if (cmSystemTools::GetPermissions(fileName.c_str(), mode)) {
cmSystemTools::SetPermissions(fileName.c_str(),
#if defined(_MSC_VER) || defined(__MINGW32__)
mode | S_IWRITE
writable = mode & S_IWRITE;
mode_t newMode = mode | S_IWRITE;
#else
mode | S_IWUSR | S_IWGRP
writable = mode & S_IWUSR;
mode_t newMode = mode | S_IWUSR | S_IWGRP;
#endif
);
if (!writable) {
cmSystemTools::SetPermissions(fileName.c_str(), newMode);
}
}
// If GetPermissions fails, pretend like it is ok. File open will fail if
// the file is not writable
@@ -69,7 +73,7 @@ bool cmWriteFileCommand::InitialPass(std::vector<std::string> const& args,
}
file << message << std::endl;
file.close();
if (mode) {
if (mode && !writable) {
cmSystemTools::SetPermissions(fileName.c_str(), mode);
}