diff options
| -rw-r--r-- | Source/cmFileCommand.cxx | 26 | ||||
| -rw-r--r-- | Source/cmWriteFileCommand.cxx | 27 |
2 files changed, 53 insertions, 0 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 0bc515c..e66ac08 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -89,6 +89,31 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args, std::string dir = cmSystemTools::GetFilenamePath(fileName); cmSystemTools::MakeDirectory(dir.c_str()); + mode_t mode = +#if defined( _MSC_VER ) || defined( __MINGW32__ ) + S_IREAD | S_IWRITE +#elif defined( __BORLANDC__ ) + S_IRUSR | S_IWUSR +#else + S_IRUSR | S_IWUSR | + S_IRGRP | + S_IROTH +#endif + ; + + // Set permissions to writable + if ( cmSystemTools::GetPermissions(fileName.c_str(), mode) ) + { + cmSystemTools::SetPermissions(fileName.c_str(), +#if defined( _MSC_VER ) || defined( __MINGW32__ ) + S_IREAD | S_IWRITE +#else + S_IRUSR | S_IWUSR +#endif + ); + } + // If GetPermissions fails, pretend like it is ok. File open will fail if + // the file is not writable std::ofstream file(fileName.c_str(), append?std::ios::app: std::ios::out); if ( !file ) { @@ -100,6 +125,7 @@ bool cmFileCommand::HandleWriteCommand(std::vector<std::string> const& args, } file << message; file.close(); + cmSystemTools::SetPermissions(fileName.c_str(), mode); m_Makefile->AddWrittenFile(fileName.c_str()); return true; } diff --git a/Source/cmWriteFileCommand.cxx b/Source/cmWriteFileCommand.cxx index dbf14ec..d41d0e3 100644 --- a/Source/cmWriteFileCommand.cxx +++ b/Source/cmWriteFileCommand.cxx @@ -45,16 +45,43 @@ bool cmWriteFileCommand::InitialPass(std::vector<std::string> const& args) std::string dir = cmSystemTools::GetFilenamePath(fileName); cmSystemTools::MakeDirectory(dir.c_str()); + mode_t mode = +#if defined( _MSC_VER ) || defined( __MINGW32__ ) + S_IREAD | S_IWRITE +#elif defined( __BORLANDC__ ) + S_IRUSR | S_IWUSR +#else + S_IRUSR | S_IWUSR | + S_IRGRP | + S_IROTH +#endif + ; + + // Set permissions to writable + if ( cmSystemTools::GetPermissions(fileName.c_str(), mode) ) + { + cmSystemTools::SetPermissions(fileName.c_str(), +#if defined( _MSC_VER ) || defined( __MINGW32__ ) + S_IREAD | S_IWRITE +#else + S_IRUSR | S_IWUSR +#endif + ); + } + // If GetPermissions fails, pretend like it is ok. File open will fail if + // the file is not writable std::ofstream file(fileName.c_str(), overwrite?std::ios::out : std::ios::app); if ( !file ) { std::string error = "Internal CMake error when trying to open file: "; error += fileName.c_str(); + error += " for writting."; this->SetError(error.c_str()); return false; } file << message << std::endl; file.close(); + cmSystemTools::SetPermissions(fileName.c_str(), mode); m_Makefile->AddWrittenFile(fileName.c_str()); return true; |