diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2020-05-06 11:33:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-06 11:33:55 +0200 |
commit | 74a1bfdcab03d3c6ecb9353f4bae0a0c550ddb98 (patch) | |
tree | aefac7fd096274bd795cec43f222e93e4a26376e /src/libstore/gc.cc | |
parent | 272c4ba36dab76b01eef19bd30e56310d033b4dd (diff) | |
parent | 2e5be2a7495ac0b204454c74664e590a38d039d3 (diff) |
Merge pull request #3546 from guibou/nix_readfile_on_0_sized_files
builtins.readFile: do not truncate content
Diffstat (limited to 'src/libstore/gc.cc')
-rw-r--r-- | src/libstore/gc.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc index d210defe5..95a4bc934 100644 --- a/src/libstore/gc.cc +++ b/src/libstore/gc.cc @@ -419,7 +419,7 @@ void LocalStore::findRuntimeRoots(Roots & roots, bool censor) try { auto mapFile = fmt("/proc/%s/maps", ent->d_name); - auto mapLines = tokenizeString<std::vector<string>>(readFile(mapFile, true), "\n"); + auto mapLines = tokenizeString<std::vector<string>>(readFile(mapFile), "\n"); for (const auto & line : mapLines) { auto match = std::smatch{}; if (std::regex_match(line, match, mapRegex)) @@ -427,7 +427,7 @@ void LocalStore::findRuntimeRoots(Roots & roots, bool censor) } auto envFile = fmt("/proc/%s/environ", ent->d_name); - auto envString = readFile(envFile, true); + auto envString = readFile(envFile); auto env_end = std::sregex_iterator{}; for (auto i = std::sregex_iterator{envString.begin(), envString.end(), storePathRegex}; i != env_end; ++i) unchecked[i->str()].emplace(envFile); |