#include <apt-pkg/edsp.h>
#include <apt-pkg/tagfile.h>
#include <apt-pkg/strutl.h>
+#include <apt-pkg/string_view.h>
#include <apt-pkg/pkgsystem.h>
#include <ctype.h>
// StringToBool - convert yes/no to bool /*{{{*/
// ---------------------------------------------------------------------
/* we are not as lazy as we are in the global StringToBool as we really
- only accept yes/no here - but we will ignore leading spaces */
-static bool StringToBool(char const *answer, bool const defValue) {
- for (; isspace(*answer) != 0; ++answer);
- if (strncasecmp(answer, "yes", 3) == 0)
+ only accept yes/no here */
+static bool localStringToBool(std::string answer, bool const defValue) {
+ std::transform(answer.begin(), answer.end(), answer.begin(), ::tolower);
+ if (answer == "yes")
return true;
- else if (strncasecmp(answer, "no", 2) == 0)
+ else if (answer == "no")
return false;
else
- _error->Warning("Value '%s' is not a boolean 'yes' or 'no'!", answer);
+ _error->Warning("Value '%s' is not a boolean 'yes' or 'no'!", answer.c_str());
return defValue;
}
/*}}}*/
-static bool ReadFlag(unsigned int &flags, std::string const &line, APT::StringView const name, unsigned int const setflag)/*{{{*/
+static bool LineStartsWithAndStrip(std::string &line, APT::StringView const with)/*{{{*/
{
- if (line.compare(0, name.length(), name.data()) != 0)
+ if (line.compare(0, with.size(), with.data()) != 0)
return false;
- auto const l = line.c_str() + name.length() + 1;
- if (StringToBool(l, false))
+ line = APT::String::Strip(line.substr(with.length()));
+ return true;
+}
+ /*}}}*/
+static bool ReadFlag(unsigned int &flags, std::string &line, APT::StringView const name, unsigned int const setflag)/*{{{*/
+{
+ if (LineStartsWithAndStrip(line, name) == false)
+ return false;
+ if (localStringToBool(line, false))
flags |= setflag;
else
flags &= ~setflag;
if (line.empty() == true)
continue;
// The first Tag must be a request, so search for it
- if (line.compare(0, 8, "Request:") != 0)
+ if (LineStartsWithAndStrip(line, "Request:"))
continue;
while (ReadLine(input, line) == true)
return true;
std::list<std::string> *request = NULL;
- if (line.compare(0, 8, "Install:") == 0)
- {
- line.erase(0, 8);
+ if (LineStartsWithAndStrip(line, "Install:"))
request = &install;
- }
- else if (line.compare(0, 7, "Remove:") == 0)
- {
- line.erase(0, 7);
+ else if (LineStartsWithAndStrip(line, "Remove:"))
request = &remove;
- }
else if (ReadFlag(flags, line, "Upgrade:", (Request::UPGRADE_ALL | Request::FORBID_REMOVE | Request::FORBID_NEW_INSTALL)) ||
ReadFlag(flags, line, "Dist-Upgrade:", Request::UPGRADE_ALL) ||
ReadFlag(flags, line, "Upgrade-All:", Request::UPGRADE_ALL) ||
ReadFlag(flags, line, "Forbid-Remove:", Request::FORBID_REMOVE) ||
ReadFlag(flags, line, "Autoremove:", Request::AUTOREMOVE))
;
- else if (line.compare(0, 13, "Architecture:") == 0)
- _config->Set("APT::Architecture", line.c_str() + 14);
- else if (line.compare(0, 14, "Architectures:") == 0)
- {
- std::string const archs = line.c_str() + 15;
- _config->Set("APT::Architectures", SubstVar(archs, " ", ","));
- }
- else if (line.compare(0, 7, "Solver:") == 0)
+ else if (LineStartsWithAndStrip(line, "Architecture:"))
+ _config->Set("APT::Architecture", line);
+ else if (LineStartsWithAndStrip(line, "Architectures:"))
+ _config->Set("APT::Architectures", SubstVar(line, " ", ","));
+ else if (LineStartsWithAndStrip(line, "Solver:"))
; // purely informational line
else
_error->Warning("Unknown line in EDSP Request stanza: %s", line.c_str());
if (request == NULL)
continue;
- size_t end = line.length();
- do {
- size_t begin = line.rfind(' ');
- if (begin == std::string::npos)
- {
- request->push_back(line.substr(0, end));
- break;
- }
- else if (begin < end)
- request->push_back(line.substr(begin + 1, end));
- line.erase(begin);
- end = line.find_last_not_of(' ');
- } while (end != std::string::npos);
+ auto const pkgs = VectorizeString(line, ' ');
+ std::move(pkgs.begin(), pkgs.end(), std::back_inserter(*request));
}
}
return false;
return true;
}
/*}}}*/
-// EDSP::WriteSolution - to the given file descriptor /*{{{*/
+// EDSP::WriteSolutionStanza - to the given file descriptor /*{{{*/
bool EDSP::WriteSolution(pkgDepCache &Cache, FILE* output)
{
bool const Debug = _config->FindB("Debug::EDSP::WriteSolution", false);
return true;
}
-bool EDSP::WriteSolution(pkgDepCache &Cache, FileFd &output)
+bool EDSP::WriteSolutionStanza(FileFd &output, char const * const Type, pkgCache::VerIterator const &Ver)
{
- bool const Debug = _config->FindB("Debug::EDSP::WriteSolution", false);
bool Okay = output.Failed() == false;
- for (pkgCache::PkgIterator Pkg = Cache.PkgBegin(); Pkg.end() == false && likely(Okay); ++Pkg)
- {
- std::string action;
- if (Cache[Pkg].Delete() == true)
- WriteOkay(Okay, output, "Remove: ", _system->GetVersionMapping(Pkg.CurrentVer()->ID), "\n");
- else if (Cache[Pkg].NewInstall() == true || Cache[Pkg].Upgrade() == true)
- WriteOkay(Okay, output, "Install: ", _system->GetVersionMapping(Cache.GetCandidateVersion(Pkg)->ID), "\n");
- else if (Cache[Pkg].Garbage == true)
- WriteOkay(Okay, output, "Autoremove: ", _system->GetVersionMapping(Pkg.CurrentVer()->ID), "\n");
- else
- continue;
-
- if (Debug)
- {
- WriteOkay(Okay, output, "Package: ", Pkg.FullName(), "\nVersion: ");
- if (Cache[Pkg].Delete() == true || Cache[Pkg].Garbage == true)
- WriteOkay(Okay, output, Pkg.CurrentVer().VerStr(), "\n\n");
- else
- WriteOkay(Okay, output, Cache.GetCandidateVersion(Pkg).VerStr(), "\n\n");
- }
- else
- WriteOkay(Okay, output, "\n");
- }
- return Okay;
+ WriteOkay(Okay, output, Type, ": ", _system->GetVersionMapping(Ver->ID));
+ if (_config->FindB("Debug::EDSP::WriteSolution", false) == true)
+ WriteOkay(Okay, output, "\nPackage: ", Ver.ParentPkg().FullName(), "\nVersion: ", Ver.VerStr());
+ return WriteOkay(Okay, output, "\n\n");
}
/*}}}*/
// EDSP::WriteProgess - pulse to the given file descriptor /*{{{*/
projects / apt.git / blobdiff