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

cmMakefile::ConfigureFile: Convert 'else' block to early return and deindent

Browse Source
This commit is contained in:
Alex Turbov
2024-07-01 01:24:45 +04:00
committed by Brad King
parent d4faff52d3
commit b8fb4b778c
1 changed files with 55 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmMakefile.cxx
+55 -53
View File
@@ -4084,68 +4084,70 @@ int cmMakefile::ConfigureFile(const std::string& infile,
if (!cmSystemTools::SetPermissions(soutfile, permissions)) {
this->IssueMessage(MessageType::FATAL_ERROR,
cmSystemTools::GetLastSystemError());
return 0;
res = 0;
}
return res;
}
std::string newLineCharacters;
std::ios::openmode omode = std::ios::out | std::ios::trunc;
if (newLine.IsValid()) {
newLineCharacters = newLine.GetCharacters();
omode |= std::ios::binary;
} else {
std::string newLineCharacters;
std::ios::openmode omode = std::ios::out | std::ios::trunc;
if (newLine.IsValid()) {
newLineCharacters = newLine.GetCharacters();
omode |= std::ios::binary;
} else {
newLineCharacters = "\n";
}
std::string tempOutputFile = cmStrCat(soutfile, ".tmp");
cmsys::ofstream fout(tempOutputFile.c_str(), omode);
if (!fout) {
cmSystemTools::Error("Could not open file for write in copy operation " +
tempOutputFile);
cmSystemTools::ReportLastSystemError("");
return 0;
}
cmsys::ifstream fin(sinfile.c_str());
if (!fin) {
cmSystemTools::Error("Could not open file for read in copy operation " +
sinfile);
return 0;
}
newLineCharacters = "\n";
}
std::string tempOutputFile = cmStrCat(soutfile, ".tmp");
cmsys::ofstream fout(tempOutputFile.c_str(), omode);
if (!fout) {
cmSystemTools::Error("Could not open file for write in copy operation " +
tempOutputFile);
cmSystemTools::ReportLastSystemError("");
return 0;
}
cmsys::ifstream fin(sinfile.c_str());
if (!fin) {
cmSystemTools::Error("Could not open file for read in copy operation " +
sinfile);
return 0;
}
cmsys::FStream::BOM bom = cmsys::FStream::ReadBOM(fin);
if (bom != cmsys::FStream::BOM_None && bom != cmsys::FStream::BOM_UTF8) {
this->IssueMessage(
MessageType::FATAL_ERROR,
cmStrCat("File starts with a Byte-Order-Mark that is not UTF-8:\n ",
sinfile));
return 0;
}
// rewind to copy BOM to output file
fin.seekg(0);
cmsys::FStream::BOM bom = cmsys::FStream::ReadBOM(fin);
if (bom != cmsys::FStream::BOM_None && bom != cmsys::FStream::BOM_UTF8) {
this->IssueMessage(
MessageType::FATAL_ERROR,
cmStrCat("File starts with a Byte-Order-Mark that is not UTF-8:\n ",
sinfile));
return 0;
}
// rewind to copy BOM to output file
fin.seekg(0);
// now copy input to output and expand variables in the
// input file at the same time
std::string inLine;
std::string outLine;
while (cmSystemTools::GetLineFromStream(fin, inLine)) {
outLine.clear();
this->ConfigureString(inLine, outLine, atOnly, escapeQuotes);
fout << outLine << newLineCharacters;
}
// close the files before attempting to copy
fin.close();
fout.close();
if (!cmSystemTools::CopyFileIfDifferent(tempOutputFile, soutfile)) {
// now copy input to output and expand variables in the
// input file at the same time
std::string inLine;
std::string outLine;
while (cmSystemTools::GetLineFromStream(fin, inLine)) {
outLine.clear();
this->ConfigureString(inLine, outLine, atOnly, escapeQuotes);
fout << outLine << newLineCharacters;
}
// close the files before attempting to copy
fin.close();
fout.close();
if (!cmSystemTools::CopyFileIfDifferent(tempOutputFile, soutfile)) {
this->IssueMessage(MessageType::FATAL_ERROR,
cmSystemTools::GetLastSystemError());
res = 0;
} else {
if (!cmSystemTools::SetPermissions(soutfile, permissions)) {
this->IssueMessage(MessageType::FATAL_ERROR,
cmSystemTools::GetLastSystemError());
res = 0;
} else {
if (!cmSystemTools::SetPermissions(soutfile, permissions)) {
this->IssueMessage(MessageType::FATAL_ERROR,
cmSystemTools::GetLastSystemError());
res = 0;
}
}
cmSystemTools::RemoveFile(tempOutputFile);
}
cmSystemTools::RemoveFile(tempOutputFile);
return res;
}