mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 08:20:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmFileCommand: Update for new signature of GetLineFromStream

Browse Source
This commit is contained in:
Brad King
2022-01-11 11:09:53 -05:00
parent f52dac56a0
commit 0d37dae5f9
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/cmFileCommand.cxx
View File

@@ -197,9 +197,10 @@ bool HandleReadCommand(std::vector<std::string> const& args,
}
// is there a limit?
long sizeLimit = -1;
std::string::size_type sizeLimit = std::string::npos;
if (!arguments.Limit.empty()) {
sizeLimit = atoi(arguments.Limit.c_str());
sizeLimit =
static_cast<std::string::size_type>(atoi(arguments.Limit.c_str()));
}
// is there an offset?
@@ -231,12 +232,9 @@ bool HandleReadCommand(std::vector<std::string> const& args,
cmSystemTools::GetLineFromStream(file, line, &has_newline, sizeLimit)) {
if (sizeLimit > 0) {
sizeLimit = sizeLimit - static_cast<long>(line.size());
if (has_newline) {
if (has_newline && sizeLimit > 0) {
sizeLimit--;
}
if (sizeLimit < 0) {
sizeLimit = 0;
}
}
output += line;
if (has_newline) {