fix M-A:foreign provides creation for unknown archs

[apt.git] / apt-pkg / deb / deblistparser.cc

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 42eca8677fef61e00f20ec8fedefae82f9c6a5fc..8dca27a2a7d86e89bee51cc33533a89d94ebd259 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -34,8 +34,9 @@
                                                                        /*}}}*/
 
 using std::string;
                                                                        /*}}}*/
 
 using std::string;

+using APT::StringView;

 
 

-static debListParser::WordList PrioList[] = {
+static const debListParser::WordList PrioList[] = {

    {"required",pkgCache::State::Required},
    {"important",pkgCache::State::Important},
    {"standard",pkgCache::State::Standard},
    {"required",pkgCache::State::Required},
    {"important",pkgCache::State::Important},
    {"standard",pkgCache::State::Standard},


@@ -57,7 +58,12 @@ debListParser::debListParser(FileFd *File) :
 // ---------------------------------------------------------------------
 /* This is to return the name of the package this section describes */
 string debListParser::Package() {
 // ---------------------------------------------------------------------
 /* This is to return the name of the package this section describes */
 string debListParser::Package() {

-   string const Result = Section.FindS("Package");
+   string Result = Section.Find("Package").to_string();
+
+   // Normalize mixed case package names to lower case, like dpkg does
+   // See Bug#807012 for details
+   std::transform(Result.begin(), Result.end(), Result.begin(), tolower_ascii);
+

    if(unlikely(Result.empty() == true))
       _error->Error("Encountered a section with no Package: header");
    return Result;
    if(unlikely(Result.empty() == true))
       _error->Error("Encountered a section with no Package: header");
    return Result;


@@ -67,15 +73,15 @@ string debListParser::Package() {
 // ---------------------------------------------------------------------
 /* This will return the Architecture of the package this section describes */
 string debListParser::Architecture() {
 // ---------------------------------------------------------------------
 /* This will return the Architecture of the package this section describes */
 string debListParser::Architecture() {

-   std::string const Arch = Section.FindS("Architecture");
-   return Arch.empty() ? "none" : Arch;
+   auto const Arch = Section.Find("Architecture");
+   return Arch.empty() ? "none" : Arch.to_string();

 }
                                                                        /*}}}*/
 // ListParser::ArchitectureAll                                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool debListParser::ArchitectureAll() {
 }
                                                                        /*}}}*/
 // ListParser::ArchitectureAll                                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 bool debListParser::ArchitectureAll() {

-   return Section.FindS("Architecture") == "all";
+   return Section.Find("Architecture") == "all";

 }
                                                                        /*}}}*/
 // ListParser::Version - Return the version string                     /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::Version - Return the version string                     /*{{{*/


@@ -85,13 +91,13 @@ bool debListParser::ArchitectureAll() {
    entry is assumed to only describe package properties */
 string debListParser::Version()
 {
    entry is assumed to only describe package properties */
 string debListParser::Version()
 {

-   return Section.FindS("Version");
+   return Section.Find("Version").to_string();

 }
                                                                        /*}}}*/
 unsigned char debListParser::ParseMultiArch(bool const showErrors)     /*{{{*/
 {
    unsigned char MA;
 }
                                                                        /*}}}*/
 unsigned char debListParser::ParseMultiArch(bool const showErrors)     /*{{{*/
 {
    unsigned char MA;

-   string const MultiArch = Section.FindS("Multi-Arch");
+   auto const MultiArch = Section.Find("Multi-Arch");

    if (MultiArch.empty() == true || MultiArch == "no")
       MA = pkgCache::Version::No;
    else if (MultiArch == "same") {
    if (MultiArch.empty() == true || MultiArch == "no")
       MA = pkgCache::Version::No;
    else if (MultiArch == "same") {


@@ -113,7 +119,7 @@ unsigned char debListParser::ParseMultiArch(bool const showErrors)  /*{{{*/
    {
       if (showErrors == true)
         _error->Warning("Unknown Multi-Arch type '%s' for package '%s'",
    {
       if (showErrors == true)
         _error->Warning("Unknown Multi-Arch type '%s' for package '%s'",

-              MultiArch.c_str(), Section.FindS("Package").c_str());
+              MultiArch.to_string().c_str(), Section.FindS("Package").c_str());

       MA = pkgCache::Version::No;
    }
 
       MA = pkgCache::Version::No;
    }
 


@@ -199,7 +205,7 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
    // Priority
    if (Section.Find("Priority",Start,Stop) == true)
    {
    // Priority
    if (Section.Find("Priority",Start,Stop) == true)
    {

-      if (GrabWord(string(Start,Stop-Start),PrioList,Ver->Priority) == false)
+      if (GrabWord(StringView(Start,Stop-Start),PrioList,Ver->Priority) == false)

         Ver->Priority = pkgCache::State::Extra;
    }
 
         Ver->Priority = pkgCache::State::Extra;
    }
 


@@ -235,11 +241,16 @@ bool debListParser::NewVersion(pkgCache::VerIterator &Ver)
    form. If this returns the blank string then the entry is assumed to
    only describe package properties */
 string debListParser::Description(std::string const &lang)
    form. If this returns the blank string then the entry is assumed to
    only describe package properties */
 string debListParser::Description(std::string const &lang)

+{
+   return Description(StringView(lang)).to_string();
+}
+
+StringView debListParser::Description(StringView lang)

 {
    if (lang.empty())
 {
    if (lang.empty())

-      return Section.FindS("Description");
+      return Section.Find("Description");

    else
    else

-      return Section.FindS(string("Description-").append(lang).c_str());
+      return Section.Find(string("Description-").append(lang.data(), lang.size()));

 }
                                                                        /*}}}*/
 // ListParser::AvailableDescriptionLanguages                           /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::AvailableDescriptionLanguages                           /*{{{*/


@@ -247,12 +258,19 @@ std::vector<std::string> debListParser::AvailableDescriptionLanguages()
 {
    std::vector<std::string> const understood = APT::Configuration::getLanguages();
    std::vector<std::string> avail;
 {
    std::vector<std::string> const understood = APT::Configuration::getLanguages();
    std::vector<std::string> avail;

+   static constexpr int prefixLen = 12;
+   static constexpr int avgLanguageLen = 5;
+   std::string tagname;
+
+   tagname.reserve(prefixLen + avgLanguageLen);
+   tagname.assign("Description-");

    if (Section.Exists("Description") == true)
       avail.push_back("");
    for (std::vector<std::string>::const_iterator lang = understood.begin(); lang != understood.end(); ++lang)
    {
    if (Section.Exists("Description") == true)
       avail.push_back("");
    for (std::vector<std::string>::const_iterator lang = understood.begin(); lang != understood.end(); ++lang)
    {

-      std::string const tagname = "Description-" + *lang;
-      if (Section.Exists(tagname.c_str()) == true)
+      tagname.resize(prefixLen);
+      tagname.append(*lang);
+      if (Section.Exists(tagname) == true)

         avail.push_back(*lang);
    }
    return avail;
         avail.push_back(*lang);
    }
    return avail;


@@ -266,25 +284,28 @@ std::vector<std::string> debListParser::AvailableDescriptionLanguages()
  */
 MD5SumValue debListParser::Description_md5()
 {
  */
 MD5SumValue debListParser::Description_md5()
 {

-   string const value = Section.FindS("Description-md5");
+   auto const value = Section.Find("Description-md5");

    if (value.empty() == true)
    {
    if (value.empty() == true)
    {

-      std::string const desc = Description("") + "\n";
+      StringView desc = Description(StringView("", 0));

       if (desc == "\n")
         return MD5SumValue();
 
       MD5Summation md5;
       if (desc == "\n")
         return MD5SumValue();
 
       MD5Summation md5;

-      md5.Add(desc.c_str());
+      md5.Add(desc.data(), desc.size());
+      md5.Add("\n");

       return md5.Result();
    }
    else if (likely(value.size() == 32))
    {
       return md5.Result();
    }
    else if (likely(value.size() == 32))
    {

-      if (likely(value.find_first_not_of("0123456789abcdefABCDEF") == string::npos))
-        return MD5SumValue(value);
-      _error->Error("Malformed Description-md5 line; includes invalid character '%s'", value.c_str());
+      MD5SumValue sumvalue;
+      if (sumvalue.Set(value))
+        return sumvalue;
+
+      _error->Error("Malformed Description-md5 line; includes invalid character '%.*s'", (int)value.length(), value.data());

       return MD5SumValue();
    }
       return MD5SumValue();
    }

-   _error->Error("Malformed Description-md5 line; doesn't have the required length (32 != %d) '%s'", (int)value.size(), value.c_str());
+   _error->Error("Malformed Description-md5 line; doesn't have the required length (32 != %d) '%.*s'", (int)value.size(), (int)value.length(), value.data());

    return MD5SumValue();
 }
                                                                         /*}}}*/
    return MD5SumValue();
 }
                                                                         /*}}}*/


@@ -325,21 +346,21 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
 /* */
 unsigned short debListParser::VersionHash()
 {
 /* */
 unsigned short debListParser::VersionHash()
 {

-   const char *Sections[] ={"Installed-Size",
+   static const StringView Sections[] ={"Installed-Size",

                             "Depends",
                             "Pre-Depends",
 //                            "Suggests",
 //                            "Recommends",
                             "Conflicts",
                             "Breaks",
                             "Depends",
                             "Pre-Depends",
 //                            "Suggests",
 //                            "Recommends",
                             "Conflicts",
                             "Breaks",

-                            "Replaces",0};
+                            "Replaces"};

    unsigned long Result = INIT_FCS;
    char S[1024];
    unsigned long Result = INIT_FCS;
    char S[1024];

-   for (const char * const *I = Sections; *I != 0; ++I)
+   for (StringView I : Sections)

    {
       const char *Start;
       const char *End;
    {
       const char *Start;
       const char *End;

-      if (Section.Find(*I,Start,End) == false || End - Start >= (signed)sizeof(S))
+      if (Section.Find(I,Start,End) == false || End - Start >= (signed)sizeof(S))

         continue;
       
       /* Strip out any spaces from the text, this undoes dpkgs reformatting
         continue;
       
       /* Strip out any spaces from the text, this undoes dpkgs reformatting


@@ -348,7 +369,7 @@ unsigned short debListParser::VersionHash()
       char *J = S;
       for (; Start != End; ++Start)
       {
       char *J = S;
       for (; Start != End; ++Start)
       {

-        if (isspace(*Start) != 0)
+        if (isspace_ascii(*Start) != 0)

            continue;
         *J++ = tolower_ascii(*Start);
 
            continue;
         *J++ = tolower_ascii(*Start);
 


@@ -362,7 +383,7 @@ unsigned short debListParser::VersionHash()
    return Result;
 }
                                                                        /*}}}*/
    return Result;
 }
                                                                        /*}}}*/

-// ListParser::ParseStatus - Parse the status field                    /*{{{*/
+// StatusListParser::ParseStatus - Parse the status field              /*{{{*/

 // ---------------------------------------------------------------------
 /* Status lines are of the form,
      Status: want flag status
 // ---------------------------------------------------------------------
 /* Status lines are of the form,
      Status: want flag status


@@ -371,7 +392,12 @@ unsigned short debListParser::VersionHash()
    status = not-installed, config-files, half-installed, unpacked,
             half-configured, triggers-awaited, triggers-pending, installed
  */
    status = not-installed, config-files, half-installed, unpacked,
             half-configured, triggers-awaited, triggers-pending, installed
  */

-bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
+bool debListParser::ParseStatus(pkgCache::PkgIterator &,
+                               pkgCache::VerIterator &)
+{
+   return true;
+}
+bool debStatusListParser::ParseStatus(pkgCache::PkgIterator &Pkg,

                                pkgCache::VerIterator &Ver)
 {
    const char *Start;
                                pkgCache::VerIterator &Ver)
 {
    const char *Start;


@@ -398,7 +424,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                           {"deinstall",pkgCache::State::DeInstall},
                           {"purge",pkgCache::State::Purge},
                           {NULL, 0}};
                           {"deinstall",pkgCache::State::DeInstall},
                           {"purge",pkgCache::State::Purge},
                           {NULL, 0}};

-   if (GrabWord(string(Start,I-Start),WantList,Pkg->SelectedState) == false)
+   if (GrabWord(StringView(Start,I-Start),WantList,Pkg->SelectedState) == false)

       return _error->Error("Malformed 1st word in the Status line");
 
    // Isloate the next word
       return _error->Error("Malformed 1st word in the Status line");
 
    // Isloate the next word


@@ -414,7 +440,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                           {"hold",pkgCache::State::HoldInst},
                           {"hold-reinstreq",pkgCache::State::HoldReInstReq},
                           {NULL, 0}};
                           {"hold",pkgCache::State::HoldInst},
                           {"hold-reinstreq",pkgCache::State::HoldReInstReq},
                           {NULL, 0}};

-   if (GrabWord(string(Start,I-Start),FlagList,Pkg->InstState) == false)
+   if (GrabWord(StringView(Start,I-Start),FlagList,Pkg->InstState) == false)

       return _error->Error("Malformed 2nd word in the Status line");
 
    // Isloate the last word
       return _error->Error("Malformed 2nd word in the Status line");
 
    // Isloate the last word


@@ -434,7 +460,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator &Pkg,
                             {"triggers-pending",pkgCache::State::TriggersPending},
                             {"installed",pkgCache::State::Installed},
                             {NULL, 0}};
                             {"triggers-pending",pkgCache::State::TriggersPending},
                             {"installed",pkgCache::State::Installed},
                             {NULL, 0}};

-   if (GrabWord(string(Start,I-Start),StatusList,Pkg->CurrentState) == false)
+   if (GrabWord(StringView(Start,I-Start),StatusList,Pkg->CurrentState) == false)

       return _error->Error("Malformed 3rd word in the Status line");
 
    /* A Status line marks the package as indicating the current
       return _error->Error("Malformed 3rd word in the Status line");
 
    /* A Status line marks the package as indicating the current


@@ -531,13 +557,29 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
                                        unsigned int &Op, bool const &ParseArchFlags,
                                        bool const &StripMultiArch,
                                        bool const &ParseRestrictionsList)
                                        unsigned int &Op, bool const &ParseArchFlags,
                                        bool const &StripMultiArch,
                                        bool const &ParseRestrictionsList)

+{
+   StringView PackageView;
+   StringView VerView;
+
+   auto res = ParseDepends(Start, Stop, PackageView, VerView, Op, (bool)ParseArchFlags,
+   (bool) StripMultiArch, (bool) ParseRestrictionsList);
+   Package = PackageView.to_string();
+   Ver = VerView.to_string();
+
+   return res;
+}
+const char *debListParser::ParseDepends(const char *Start,const char *Stop,
+                                       StringView &Package,StringView &Ver,
+                                       unsigned int &Op, bool ParseArchFlags,
+                                       bool StripMultiArch,
+                                       bool ParseRestrictionsList)

 {
    // Strip off leading space
 {
    // Strip off leading space

-   for (;Start != Stop && isspace(*Start) != 0; ++Start);
+   for (;Start != Stop && isspace_ascii(*Start) != 0; ++Start);

    
    // Parse off the package name
    const char *I = Start;
    
    // Parse off the package name
    const char *I = Start;

-   for (;I != Stop && isspace(*I) == 0 && *I != '(' && *I != ')' &&
+   for (;I != Stop && isspace_ascii(*I) == 0 && *I != '(' && *I != ')' &&

        *I != ',' && *I != '|' && *I != '[' && *I != ']' &&
        *I != '<' && *I != '>'; ++I);
    
        *I != ',' && *I != '|' && *I != '[' && *I != ']' &&
        *I != '<' && *I != '>'; ++I);
    


@@ -549,33 +591,33 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
       return 0;
    
    // Stash the package name
       return 0;
    
    // Stash the package name

-   Package.assign(Start,I - Start);
+   Package = StringView(Start, I - Start);

 
    // We don't want to confuse library users which can't handle MultiArch
 
    // We don't want to confuse library users which can't handle MultiArch

-   string const arch = _config->Find("APT::Architecture");

    if (StripMultiArch == true) {
    if (StripMultiArch == true) {

+      string const arch = _config->Find("APT::Architecture");

       size_t const found = Package.rfind(':');
       size_t const found = Package.rfind(':');

-      if (found != string::npos &&
-         (strcmp(Package.c_str() + found, ":any") == 0 ||
-          strcmp(Package.c_str() + found, ":native") == 0 ||
-          strcmp(Package.c_str() + found + 1, arch.c_str()) == 0))
+      if (found != StringView::npos &&
+         (Package.substr(found) == ":any" ||
+          Package.substr(found) == ":native" ||
+          Package.substr(found +1) == arch))

         Package = Package.substr(0,found);
    }
 
    // Skip white space to the '('
         Package = Package.substr(0,found);
    }
 
    // Skip white space to the '('

-   for (;I != Stop && isspace(*I) != 0 ; I++);
+   for (;I != Stop && isspace_ascii(*I) != 0 ; I++);

    
    // Parse a version
    if (I != Stop && *I == '(')
    {
       // Skip the '('
    
    // Parse a version
    if (I != Stop && *I == '(')
    {
       // Skip the '('

-      for (I++; I != Stop && isspace(*I) != 0 ; I++);
+      for (I++; I != Stop && isspace_ascii(*I) != 0 ; I++);

       if (I + 3 >= Stop)
         return 0;
       I = ConvertRelation(I,Op);
       
       // Skip whitespace
       if (I + 3 >= Stop)
         return 0;
       I = ConvertRelation(I,Op);
       
       // Skip whitespace

-      for (;I != Stop && isspace(*I) != 0; I++);
+      for (;I != Stop && isspace_ascii(*I) != 0; I++);

       Start = I;
       I = (const char*) memchr(I, ')', Stop - I);
       if (I == NULL || Start == I)
       Start = I;
       I = (const char*) memchr(I, ')', Stop - I);
       if (I == NULL || Start == I)


@@ -583,22 +625,23 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
       
       // Skip trailing whitespace
       const char *End = I;
       
       // Skip trailing whitespace
       const char *End = I;

-      for (; End > Start && isspace(End[-1]); End--);
+      for (; End > Start && isspace_ascii(End[-1]); End--);

       
       

-      Ver.assign(Start,End-Start);
+      Ver = StringView(Start,End-Start);

       I++;
    }
    else
    {
       I++;
    }
    else
    {

-      Ver.clear();
+      Ver = StringView();

       Op = pkgCache::Dep::NoOp;
    }
    
    // Skip whitespace
       Op = pkgCache::Dep::NoOp;
    }
    
    // Skip whitespace

-   for (;I != Stop && isspace(*I) != 0; I++);
+   for (;I != Stop && isspace_ascii(*I) != 0; I++);

 
 

-   if (ParseArchFlags == true)
+   if (unlikely(ParseArchFlags == true))

    {
    {

+      string const arch = _config->Find("APT::Architecture");

       APT::CacheFilter::PackageArchitectureMatchesSpecification matchesArch(arch, false);
 
       // Parse an architecture
       APT::CacheFilter::PackageArchitectureMatchesSpecification matchesArch(arch, false);
 
       // Parse an architecture


@@ -615,7 +658,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
         while (I != Stop)
         {
            // look for whitespace or ending ']'
         while (I != Stop)
         {
            // look for whitespace or ending ']'

-           for (;End != Stop && !isspace(*End) && *End != ']'; ++End);
+           for (;End != Stop && !isspace_ascii(*End) && *End != ']'; ++End);

 
            if (unlikely(End == Stop))
               return 0;
 
            if (unlikely(End == Stop))
               return 0;


@@ -642,7 +685,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
            }
 
            I = End;
            }
 
            I = End;

-           for (;I != Stop && isspace(*I) != 0; I++);
+           for (;I != Stop && isspace_ascii(*I) != 0; I++);

         }
 
         if (NegArch == true)
         }
 
         if (NegArch == true)


@@ -653,10 +696,10 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
       }
 
       // Skip whitespace
       }
 
       // Skip whitespace

-      for (;I != Stop && isspace(*I) != 0; I++);
+      for (;I != Stop && isspace_ascii(*I) != 0; I++);

    }
 
    }
 

-   if (ParseRestrictionsList == true)
+   if (unlikely(ParseRestrictionsList == true))

    {
       // Parse a restrictions formula which is in disjunctive normal form:
       // (foo AND bar) OR (blub AND bla)
    {
       // Parse a restrictions formula which is in disjunctive normal form:
       // (foo AND bar) OR (blub AND bla)


@@ -686,7 +729,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
            for (;End != Stop && *End != '>'; ++End);
            I = ++End;
            // skip whitespace
            for (;End != Stop && *End != '>'; ++End);
            I = ++End;
            // skip whitespace

-           for (;I != Stop && isspace(*I) != 0; I++);
+           for (;I != Stop && isspace_ascii(*I) != 0; I++);

         } else {
            bool applies2 = true;
            // all the conditions inside a restriction list have to be
         } else {
            bool applies2 = true;
            // all the conditions inside a restriction list have to be


@@ -696,7 +739,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
            {
               // look for whitespace or ending '>'
               // End now points to the character after the current term
            {
               // look for whitespace or ending '>'
               // End now points to the character after the current term

-              for (;End != Stop && !isspace(*End) && *End != '>'; ++End);
+              for (;End != Stop && !isspace_ascii(*End) && *End != '>'; ++End);

 
               if (unlikely(End == Stop))
                  return 0;
 
               if (unlikely(End == Stop))
                  return 0;


@@ -729,13 +772,13 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
               if (*End++ == '>') {
                  I = End;
                  // skip whitespace
               if (*End++ == '>') {
                  I = End;
                  // skip whitespace

-                 for (;I != Stop && isspace(*I) != 0; I++);
+                 for (;I != Stop && isspace_ascii(*I) != 0; I++);

                  break;
               }
 
               I = End;
               // skip whitespace
                  break;
               }
 
               I = End;
               // skip whitespace

-              for (;I != Stop && isspace(*I) != 0; I++);
+              for (;I != Stop && isspace_ascii(*I) != 0; I++);

            }
            if (applies2) {
               applies1 = true;
            }
            if (applies2) {
               applies1 = true;


@@ -754,7 +797,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
    if (I == Stop || *I == ',' || *I == '|')
    {
       if (I != Stop)
    if (I == Stop || *I == ',' || *I == '|')
    {
       if (I != Stop)

-        for (I++; I != Stop && isspace(*I) != 0; I++);
+        for (I++; I != Stop && isspace_ascii(*I) != 0; I++);

       return I;
    }
    
       return I;
    }
    


@@ -766,7 +809,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
 /* This is the higher level depends parser. It takes a tag and generates
    a complete depends tree for the given version. */
 bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
 /* This is the higher level depends parser. It takes a tag and generates
    a complete depends tree for the given version. */
 bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,

-                                const char *Tag,unsigned int Type)
+                                StringView Tag,unsigned int Type)

 {
    const char *Start;
    const char *Stop;
 {
    const char *Start;
    const char *Stop;


@@ -777,29 +820,35 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
 
    while (1)
    {
 
    while (1)
    {

-      string Package;
-      string Version;
+      StringView Package;
+      StringView Version;

       unsigned int Op;
 
       Start = ParseDepends(Start, Stop, Package, Version, Op, false, false, false);
       if (Start == 0)
       unsigned int Op;
 
       Start = ParseDepends(Start, Stop, Package, Version, Op, false, false, false);
       if (Start == 0)

-        return _error->Error("Problem parsing dependency %s",Tag);
+        return _error->Error("Problem parsing dependency %.*s",(int)Tag.length(), Tag.data());

       size_t const found = Package.rfind(':');
 
       size_t const found = Package.rfind(':');
 

-      if (found == string::npos || strcmp(Package.c_str() + found, ":any") == 0)
+      if (found == string::npos)

       {
         if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false)
            return false;
       }
       {
         if (NewDepends(Ver,Package,pkgArch,Version,Op,Type) == false)
            return false;
       }

+      else if (Package.substr(found) == ":any")
+      {
+        if (NewDepends(Ver,Package,"any",Version,Op,Type) == false)
+           return false;
+      }

       else
       {
       else
       {

-        string Arch = Package.substr(found+1, string::npos);
-        Package = Package.substr(0, found);

         // Such dependencies are not supposed to be accepted …
         // … but this is probably the best thing to do anyway
         // Such dependencies are not supposed to be accepted …
         // … but this is probably the best thing to do anyway

-        if (Arch == "native")
-           Arch = _config->Find("APT::Architecture");
-        if (NewDepends(Ver,Package,Arch,Version,Op | pkgCache::Dep::ArchSpecific,Type) == false)
+        std::string Pkg;
+        if (Package.substr(found + 1) == "native")
+           Pkg = Package.substr(0, found).to_string() + ':' + Ver.Cache()->NativeArch();
+        else
+           Pkg = Package.to_string();
+        if (NewDepends(Ver, Pkg, "any", Version, Op | pkgCache::Dep::ArchSpecific, Type) == false)

            return false;
       }
 
            return false;
       }
 


@@ -814,60 +863,116 @@ bool debListParser::ParseDepends(pkgCache::VerIterator &Ver,
 /* */
 bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)
 {
 /* */
 bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)
 {

+   /* it is unlikely, but while parsing dependencies, we might have already
+      picked up multi-arch implicit provides which we do not want to duplicate here */
+   bool hasProvidesAlready = false;
+   std::string const spzName = Ver.ParentPkg().FullName(false);
+   {
+      for (pkgCache::PrvIterator Prv = Ver.ProvidesList(); Prv.end() == false; ++Prv)
+      {
+        if (Prv.IsMultiArchImplicit() == false || (Prv->Flags & pkgCache::Flag::ArchSpecific) == 0)
+           continue;
+        if (spzName != Prv.OwnerPkg().FullName(false))
+           continue;
+        hasProvidesAlready = true;
+        break;
+      }
+   }
+
+   string const Arch = Ver.Arch();

    const char *Start;
    const char *Stop;
    if (Section.Find("Provides",Start,Stop) == true)
    {
    const char *Start;
    const char *Stop;
    if (Section.Find("Provides",Start,Stop) == true)
    {

-      string Package;
-      string Version;
-      string const Arch = Ver.Arch();
+      StringView Package;
+      StringView Version;

       unsigned int Op;
 
       unsigned int Op;
 

-      while (1)
+      do

       {
       {

-        Start = ParseDepends(Start,Stop,Package,Version,Op);
+        Start = ParseDepends(Start,Stop,Package,Version,Op, false, false, false);

         const size_t archfound = Package.rfind(':');
         if (Start == 0)
            return _error->Error("Problem parsing Provides line");
         const size_t archfound = Package.rfind(':');
         if (Start == 0)
            return _error->Error("Problem parsing Provides line");

-        if (Op != pkgCache::Dep::NoOp && Op != pkgCache::Dep::Equals) {
-           _error->Warning("Ignoring Provides line with non-equal DepCompareOp for package %s", Package.c_str());
+        if (unlikely(Op != pkgCache::Dep::NoOp && Op != pkgCache::Dep::Equals)) {
+           _error->Warning("Ignoring Provides line with non-equal DepCompareOp for package %s", Package.to_string().c_str());

         } else if (archfound != string::npos) {
         } else if (archfound != string::npos) {

-           string OtherArch = Package.substr(archfound+1, string::npos);
-           Package = Package.substr(0, archfound);
-           if (NewProvides(Ver, Package, OtherArch, Version, pkgCache::Flag::ArchSpecific) == false)
+           StringView spzArch = Package.substr(archfound + 1);
+           if (spzArch != "any")
+           {
+              if (NewProvides(Ver, Package.substr(0, archfound), spzArch, Version, pkgCache::Flag::MultiArchImplicit | pkgCache::Flag::ArchSpecific) == false)
+                 return false;
+           }
+           if (NewProvides(Ver, Package, "any", Version, pkgCache::Flag::ArchSpecific) == false)

               return false;
         } else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) {
               return false;
         } else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign) {

-           if (NewProvidesAllArch(Ver, Package, Version, 0) == false)
+           if (APT::Configuration::checkArchitecture(Arch))
+           {
+              if (NewProvidesAllArch(Ver, Package, Version, 0) == false)
+                 return false;
+           }
+           else if (NewProvides(Ver, Package, Arch, Version, 0) == false)

               return false;
         } else {
               return false;
         } else {

+           if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed)
+           {
+              if (NewProvides(Ver, Package.to_string().append(":any"), "any", Version, pkgCache::Flag::MultiArchImplicit) == false)
+                 return false;
+           }

            if (NewProvides(Ver, Package, Arch, Version, 0) == false)
               return false;
         }
            if (NewProvides(Ver, Package, Arch, Version, 0) == false)
               return false;
         }

+        if (archfound == std::string::npos)
+        {
+           string spzName = Package.to_string();
+           spzName.push_back(':');
+           spzName.append(Ver.ParentPkg().Arch());
+           pkgCache::PkgIterator const spzPkg = Ver.Cache()->FindPkg(spzName, "any");
+           if (spzPkg.end() == false)
+           {
+              if (NewProvides(Ver, spzName, "any", Version, pkgCache::Flag::MultiArchImplicit | pkgCache::Flag::ArchSpecific) == false)
+                 return false;
+           }
+        }
+      } while (Start != Stop);
+   }

 
 

-        if (Start == Stop)
-           break;
+   if (APT::Configuration::checkArchitecture(Arch))
+   {
+      if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed)
+      {
+        string const Package = string(Ver.ParentPkg().Name()).append(":").append("any");
+        if (NewProvides(Ver, Package, "any", Ver.VerStr(), pkgCache::Flag::MultiArchImplicit) == false)
+           return false;
+      }
+      else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
+      {
+        if (NewProvidesAllArch(Ver, Ver.ParentPkg().Name(), Ver.VerStr(), pkgCache::Flag::MultiArchImplicit) == false)
+           return false;

       }
    }
 
       }
    }
 

-   if ((Ver->MultiArch & pkgCache::Version::Allowed) == pkgCache::Version::Allowed)
+   if (hasProvidesAlready == false)

    {
    {

-      string const Package = string(Ver.ParentPkg().Name()).append(":").append("any");
-      return NewProvidesAllArch(Ver, Package, Ver.VerStr(), pkgCache::Flag::MultiArchImplicit);
+      pkgCache::PkgIterator const spzPkg = Ver.Cache()->FindPkg(spzName, "any");
+      if (spzPkg.end() == false)
+      {
+        if (NewProvides(Ver, spzName, "any", Ver.VerStr(), pkgCache::Flag::MultiArchImplicit | pkgCache::Flag::ArchSpecific) == false)
+           return false;
+      }

    }
    }

-   else if ((Ver->MultiArch & pkgCache::Version::Foreign) == pkgCache::Version::Foreign)
-      return NewProvidesAllArch(Ver, Ver.ParentPkg().Name(), Ver.VerStr(), pkgCache::Flag::MultiArchImplicit);
-

    return true;
 }
                                                                        /*}}}*/
 // ListParser::GrabWord - Matches a word and returns                   /*{{{*/
 // ---------------------------------------------------------------------
 /* Looks for a word in a list of words - for ParseStatus */
    return true;
 }
                                                                        /*}}}*/
 // ListParser::GrabWord - Matches a word and returns                   /*{{{*/
 // ---------------------------------------------------------------------
 /* Looks for a word in a list of words - for ParseStatus */

-bool debListParser::GrabWord(string Word,WordList *List,unsigned char &Out)
+bool debListParser::GrabWord(StringView Word,const WordList *List,unsigned char &Out)

 {
    for (unsigned int C = 0; List[C].Str != 0; C++)
    {
 {
    for (unsigned int C = 0; List[C].Str != 0; C++)
    {

-      if (strcasecmp(Word.c_str(),List[C].Str) == 0)
+      if (Word.length() == strlen(List[C].Str) &&
+         strncasecmp(Word.data(),List[C].Str,Word.length()) == 0)

       {
         Out = List[C].Val;
         return true;
       {
         Out = List[C].Val;
         return true;