* apt-pkg/packagemanager.cc:

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

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index f6fb2789cd62e042beb5bf3f8e81cf13ab49050a..84e6c38c5440c90db4375da3e67ea740a7feb987 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -74,10 +74,7 @@ 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");
-   if (Arch.empty() == true)
-      return _config->Find("APT::Architecture");
-   return Arch;
+   return Section.FindS("Architecture");

 }
                                                                        /*}}}*/
 // ListParser::ArchitectureAll                                         /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::ArchitectureAll                                         /*{{{*/


@@ -252,7 +249,7 @@ bool debListParser::UsePackage(pkgCache::PkgIterator &Pkg,
       return false;
 
    if (strcmp(Pkg.Name(),"apt") == 0)
       return false;
 
    if (strcmp(Pkg.Name(),"apt") == 0)

-      Pkg->Flags |= pkgCache::Flag::Important;
+      Pkg->Flags |= pkgCache::Flag::Essential | pkgCache::Flag::Important;

    
    if (ParseStatus(Pkg,Ver) == false)
       return false;
    
    if (ParseStatus(Pkg,Ver) == false)
       return false;


@@ -525,9 +522,9 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
       // Skip whitespace
       for (;I != Stop && isspace(*I) != 0; I++);
       Start = I;
       // Skip whitespace
       for (;I != Stop && isspace(*I) != 0; I++);
       Start = I;

-      for (;I != Stop && *I != ')'; I++);
-      if (I == Stop || Start == I)
-        return 0;     
+      I = (const char*) memchr(I, ')', Stop - I);
+      if (I == NULL || Start == I)
+        return 0;

       
       // Skip trailing whitespace
       const char *End = I;
       
       // Skip trailing whitespace
       const char *End = I;


@@ -678,6 +675,9 @@ bool debListParser::ParseProvides(pkgCache::VerIterator &Ver)
            return _error->Error("Problem parsing Provides line");
         if (Op != pkgCache::Dep::NoOp) {
            _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());
            return _error->Error("Problem parsing Provides line");
         if (Op != pkgCache::Dep::NoOp) {
            _error->Warning("Ignoring Provides line with DepCompareOp for package %s", Package.c_str());

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

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


@@ -773,6 +773,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
    // file. to provide Component pinning we use the section name now
    FileI->Component = WriteUniqString(component);
 
    // file. to provide Component pinning we use the section name now
    FileI->Component = WriteUniqString(component);
 

+   // FIXME: Code depends on the fact that Release files aren't compressed

    FILE* release = fdopen(dup(File.Fd()), "r");
    if (release == NULL)
       return false;
    FILE* release = fdopen(dup(File.Fd()), "r");
    if (release == NULL)
       return false;


@@ -800,21 +801,16 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator &FileI,
       }
 
       // seperate the tag from the data
       }
 
       // seperate the tag from the data

-      for (; buffer[len] != ':' && buffer[len] != '\0'; ++len)
-         /* nothing */
-         ;
-      if (buffer[len] == '\0')
+      const char* dataStart = strchr(buffer + len, ':');
+      if (dataStart == NULL)

         continue;
         continue;

-      char* dataStart = buffer + len;
+      len = dataStart - buffer;

       for (++dataStart; *dataStart == ' '; ++dataStart)
          /* nothing */
          ;
       for (++dataStart; *dataStart == ' '; ++dataStart)
          /* nothing */
          ;

-      char* dataEnd = dataStart;
-      for (++dataEnd; *dataEnd != '\0'; ++dataEnd)
-         /* nothing */
-         ;
+      const char* dataEnd = (const char*)rawmemchr(dataStart, '\0');

       // The last char should be a newline, but we can never be sure: #633350
       // The last char should be a newline, but we can never be sure: #633350

-      char* lineEnd = dataEnd;
+      const char* lineEnd = dataEnd;

       for (--lineEnd; *lineEnd == '\r' || *lineEnd == '\n'; --lineEnd)
          /* nothing */
          ;
       for (--lineEnd; *lineEnd == '\r' || *lineEnd == '\n'; --lineEnd)
          /* nothing */
          ;