picnoir
/
Nix
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'repair-bad-links' of https://github.com/chkno/nix

This commit is contained in:
Eelco Dolstra 2019-11-26 20:21:48 +01:00
parent 872740cf60 3e2c77d001
commit 96e1c39bb7
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
1 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/libstore/local-store.cc
View File

@ -1241,7 +1241,35 @@ bool LocalStore::verifyStore(bool checkContents, RepairFlag repair)
/* Optionally, check the content hashes (slow). */
if (checkContents) {
printInfo("checking hashes...");
printInfo("checking link hashes...");
AutoCloseDir dir(opendir(linksDir.c_str()));
if (!dir) throw SysError(format("opening directory '%1%'") % linksDir);
struct dirent * dirent;
while (errno = 0, dirent = readdir(dir.get())) { /* sic */
checkInterrupt();
if (strcmp(dirent->d_name, ".") == 0 || strcmp(dirent->d_name, "..") == 0) continue;
Path linkPath = linksDir + "/" + dirent->d_name;
string hash = hashPath(htSHA256, linkPath).first.to_string(Base32, false);
if (hash != dirent->d_name) {
printError(format("link '%1%' was modified! "
"expected hash '%2%', got '%3%'")
% linkPath % dirent->d_name % hash);
if (repair) {
if (unlink(linkPath.c_str()) == 0)
printError(format("Removed link '%1%'") % linkPath);
else
throw SysError(format("removing corrupt link '%1%'") % linkPath);
} else {
errors = true;
}
}
}
if (errno) throw SysError(format("reading directory '%1%'") % linksDir);
printInfo("checking store hashes...");
Hash nullHash(htSHA256);