Mostly these are bugprone-unused-local-non-trivial-variable. Also fix instances of: - bugprone-optional-value-conversion - bugprone-inc-dec-in-conditions (please check this loop is correct, it is the only non trivial code change in here) - bugprone-unused-return-value (well, by fixing the lint config) There are three notable changes relating to undefined vars: - openLogFile ignoring the result. This is because openLogFile does a whole bunch of mutation of member variables - hiliteMatches: i am guessing this is because showing the derivation name was unhelpful and it just got changed - canonPath in NarAccessor: canonPath inside of a thing that is supposed to be vfs based cannot possibly be correct, so let's delete it given it is unused. Fixes: https://git.lix.systems/lix-project/lix/issues/584 Change-Id: I887adc9ff28b61f726dcfed197e6796b414c2fcf
129 lines
4.0 KiB
C++
129 lines
4.0 KiB
C++
#include "globals.hh"
|
|
#include "nar-info.hh"
|
|
#include "store-api.hh"
|
|
|
|
namespace nix {
|
|
|
|
NarInfo::NarInfo(const Store & store, const std::string & s, const std::string & whence)
|
|
: ValidPathInfo(StorePath(StorePath::dummy), Hash(Hash::dummy)) // FIXME: hack
|
|
{
|
|
unsigned line = 1;
|
|
|
|
auto corrupt = [&](const char * reason) {
|
|
return Error("NAR info file '%1%' is corrupt: %2%", whence,
|
|
std::string(reason) + (line > 0 ? " at line " + std::to_string(line) : ""));
|
|
};
|
|
|
|
auto parseHashField = [&](const std::string & s) {
|
|
try {
|
|
return Hash::parseAnyPrefixed(s);
|
|
} catch (BadHash &) {
|
|
throw corrupt("bad hash");
|
|
}
|
|
};
|
|
|
|
bool havePath = false;
|
|
bool haveNarHash = false;
|
|
|
|
size_t pos = 0;
|
|
while (pos < s.size()) {
|
|
|
|
size_t colon = s.find(':', pos);
|
|
if (colon == std::string::npos) throw corrupt("expecting ':'");
|
|
|
|
std::string name(s, pos, colon - pos);
|
|
|
|
size_t eol = s.find('\n', colon + 2);
|
|
if (eol == std::string::npos) throw corrupt("expecting '\\n'");
|
|
|
|
std::string value(s, colon + 2, eol - colon - 2);
|
|
|
|
if (name == "StorePath") {
|
|
path = store.parseStorePath(value);
|
|
havePath = true;
|
|
}
|
|
else if (name == "URL")
|
|
url = value;
|
|
else if (name == "Compression")
|
|
compression = value;
|
|
else if (name == "FileHash")
|
|
fileHash = parseHashField(value);
|
|
else if (name == "FileSize") {
|
|
auto n = string2Int<decltype(fileSize)>(value);
|
|
if (!n) throw corrupt("invalid FileSize");
|
|
fileSize = *n;
|
|
}
|
|
else if (name == "NarHash") {
|
|
narHash = parseHashField(value);
|
|
haveNarHash = true;
|
|
}
|
|
else if (name == "NarSize") {
|
|
auto n = string2Int<decltype(narSize)>(value);
|
|
if (!n) throw corrupt("invalid NarSize");
|
|
narSize = *n;
|
|
}
|
|
else if (name == "References") {
|
|
auto refs = tokenizeString<Strings>(value, " ");
|
|
if (!references.empty()) throw corrupt("extra References");
|
|
for (auto & r : refs)
|
|
references.insert(StorePath(r));
|
|
}
|
|
else if (name == "Deriver") {
|
|
if (value != "unknown-deriver")
|
|
deriver = StorePath(value);
|
|
}
|
|
else if (name == "Sig")
|
|
sigs.insert(value);
|
|
else if (name == "CA") {
|
|
if (ca) throw corrupt("extra CA");
|
|
// FIXME: allow blank ca or require skipping field?
|
|
ca = ContentAddress::parseOpt(value);
|
|
}
|
|
|
|
pos = eol + 1;
|
|
line += 1;
|
|
}
|
|
|
|
if (compression == "") compression = "bzip2";
|
|
|
|
if (!havePath || !haveNarHash || url.empty() || narSize == 0) {
|
|
line = 0; // don't include line information in the error
|
|
throw corrupt(
|
|
!havePath ? "StorePath missing" :
|
|
!haveNarHash ? "NarHash missing" :
|
|
url.empty() ? "URL missing" :
|
|
narSize == 0 ? "NarSize missing or zero"
|
|
: "?");
|
|
}
|
|
}
|
|
|
|
std::string NarInfo::to_string(const Store & store) const
|
|
{
|
|
std::string res;
|
|
res += "StorePath: " + store.printStorePath(path) + "\n";
|
|
res += "URL: " + url + "\n";
|
|
assert(compression != "");
|
|
res += "Compression: " + compression + "\n";
|
|
assert(fileHash && fileHash->type == HashType::SHA256);
|
|
res += "FileHash: " + fileHash->to_string(Base::Base32, true) + "\n";
|
|
res += "FileSize: " + std::to_string(fileSize) + "\n";
|
|
assert(narHash.type == HashType::SHA256);
|
|
res += "NarHash: " + narHash.to_string(Base::Base32, true) + "\n";
|
|
res += "NarSize: " + std::to_string(narSize) + "\n";
|
|
|
|
res += "References: " + concatStringsSep(" ", shortRefs()) + "\n";
|
|
|
|
if (deriver)
|
|
res += "Deriver: " + std::string(deriver->to_string()) + "\n";
|
|
|
|
for (auto sig : sigs)
|
|
res += "Sig: " + sig + "\n";
|
|
|
|
if (ca)
|
|
res += "CA: " + renderContentAddress(ca) + "\n";
|
|
|
|
return res;
|
|
}
|
|
|
|
}
|