ukui/apt
0
0
Fork 0
mirror of https://github.com/ukui/apt.git synced 2026-03-09 09:35:45 -07:00
Code Issues Packages Projects Releases Wiki Activity

apt-helper: Support multiple hashes for a file

Browse Source 
This just peels supported hashes of the command-line until
we reach a non-hash. For legacy compatability support, the
first hash may be an empty string.
This commit is contained in:
Julian Andres Klode
2019-04-30 11:50:11 +02:00
parent cccef6ca60
commit 4fa03143ee
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmdline/apt-helper.cc
+28 -6
View File
@@ -63,14 +63,36 @@ static bool DoDownloadFile(CommandLine &CmdL) /*{{{*/
{
std::string download_uri = CmdL.FileList[fileind + 1];
std::string targetfile = CmdL.FileList[fileind + 2];
std::string hash;
if (CmdL.FileSize() > fileind + 3)
hash = CmdL.FileList[fileind + 3];
HashStringList hashes;
fileind += 2;
// An empty string counts as a hash for compatability reasons
if (CmdL.FileSize() > fileind + 1 && *CmdL.FileList[fileind + 1] == '\0')
fileind++;
/* Let's start looking for hashes */
for (auto i = fileind + 1; CmdL.FileSize() > i; i++)
{
bool isAHash = false;
for (auto HashP = HashString::SupportedHashes(); *HashP != nullptr; HashP++)
{
if (APT::String::Startswith(CmdL.FileList[i], *HashP))
isAHash = true;
}
if (!isAHash)
break;
hashes.push_back(HashString(CmdL.FileList[i]));
fileind++;
}
// we use download_uri as descr and targetfile as short-descr
new pkgAcqFile(&Fetcher, download_uri, hash, 0, download_uri, targetfile,
"dest-dir-ignored", targetfile);
new pkgAcqFile(&Fetcher, download_uri, hashes, 0, download_uri, targetfile,
"dest-dir-ignored", targetfile);
targetfiles.push_back(targetfile);
fileind += 3;
}
bool Failed = false;