* some WS fixes

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

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 1d2c426d84d4f981c28eb13bf0b4e57deded4b64..25b533773e126ba0ca39aea68db93603c68b7990 100644 (file)
--- a/apt-pkg/deb/deblistparser.cc
+++ b/apt-pkg/deb/deblistparser.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: deblistparser.cc,v 1.26 2001/05/27 05:42:36 jgg Exp $
+// $Id: deblistparser.cc,v 1.29.2.5 2004/01/06 01:43:44 mdz Exp $

 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.
 /* ######################################################################
    
    Package Cache Generator - Generator for the cache structure.


@@ -152,7 +152,7 @@ unsigned short debListParser::VersionHash()
                             "Conflicts",
                             "Replaces",0};
    unsigned long Result = INIT_FCS;
                             "Conflicts",
                             "Replaces",0};
    unsigned long Result = INIT_FCS;

-   char S[300];
+   char S[1024];

    for (const char **I = Sections; *I != 0; I++)
    {
       const char *Start;
    for (const char **I = Sections; *I != 0; I++)
    {
       const char *Start;


@@ -173,7 +173,7 @@ unsigned short debListParser::VersionHash()
         if (*Start == '>' && Start[1] != '>' && Start[1] != '=')
            *I++ = '=';
       }
         if (*Start == '>' && Start[1] != '>' && Start[1] != '=')
            *I++ = '=';
       }

-      
+

       Result = AddCRC16(Result,S,I - S);
    }
    
       Result = AddCRC16(Result,S,I - S);
    }
    


@@ -268,11 +268,7 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
    
    return true;
 }
    
    return true;
 }

-                                                                       /*}}}*/
-// ListParser::ParseDepends - Parse a dependency element               /*{{{*/
-// ---------------------------------------------------------------------
-/* This parses the dependency elements out of a standard string in place,
-   bit by bit. */
+

 const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
 {
    // Determine the operator
 const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
 {
    // Determine the operator


@@ -331,6 +327,11 @@ const char *debListParser::ConvertRelation(const char *I,unsigned int &Op)
    return I;
 }
 
    return I;
 }
 

+                                                                       /*}}}*/
+// ListParser::ParseDepends - Parse a dependency element               /*{{{*/
+// ---------------------------------------------------------------------
+/* This parses the dependency elements out of a standard string in place,
+   bit by bit. */

 const char *debListParser::ParseDepends(const char *Start,const char *Stop,
                                        string &Package,string &Ver,
                                        unsigned int &Op, bool ParseArchFlags)
 const char *debListParser::ParseDepends(const char *Start,const char *Stop,
                                        string &Package,string &Ver,
                                        unsigned int &Op, bool ParseArchFlags)


@@ -391,7 +392,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
    if (ParseArchFlags == true)
    {
       string arch = _config->Find("APT::Architecture");
    if (ParseArchFlags == true)
    {
       string arch = _config->Find("APT::Architecture");

-      
+

       // Parse an architecture
       if (I != Stop && *I == '[')
       {
       // Parse an architecture
       if (I != Stop && *I == '[')
       {


@@ -402,6 +403,7 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
         
          const char *End = I;
          bool Found = false;
         
          const char *End = I;
          bool Found = false;

+        bool NegArch = false;

          while (I != Stop) 
         {
             // look for whitespace or ending ']'
          while (I != Stop) 
         {
             // look for whitespace or ending ']'


@@ -410,7 +412,13 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
         
            if (End == Stop) 
               return 0;
         
            if (End == Stop) 
               return 0;

-           
+
+           if (*I == '!')
+            {
+              NegArch = true;
+              I++;
+            }
+

            if (stringcmp(arch,I,End) == 0)
               Found = true;
            
            if (stringcmp(arch,I,End) == 0)
               Found = true;
            


@@ -422,8 +430,11 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
            I = End;
            for (;I != Stop && isspace(*I) != 0; I++);
          }
            I = End;
            for (;I != Stop && isspace(*I) != 0; I++);
          }

+
+        if (NegArch)
+           Found = !Found;

         
         

-         if (Found == false) 
+         if (Found == false)

            Package = ""; /* not for this arch */
       }
       
            Package = ""; /* not for this arch */
       }
       


@@ -553,16 +564,23 @@ bool debListParser::Step()
 // ---------------------------------------------------------------------
 /* */
 bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,
 // ---------------------------------------------------------------------
 /* */
 bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,

-                                   FileFd &File)
+                                   FileFd &File, string component)

 {
 {

-   pkgTagFile Tags(&File);
+   pkgTagFile Tags(&File, File.Size() + 256); // XXX

    pkgTagSection Section;
    if (Tags.Step(Section) == false)
       return false;
 
    pkgTagSection Section;
    if (Tags.Step(Section) == false)
       return false;
 

+   //mvo: I don't think we need to fill that in (it's unused since apt-0.6)
+   //FileI->Architecture = WriteUniqString(Arch);
+   
+   // apt-secure does no longer download individual (per-section) Release
+   // file. to provide Component pinning we use the section name now
+   FileI->Component = WriteUniqString(component);
+

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

-   if (Section.Find("Archive",Start,Stop) == true)
+   if (Section.Find("Suite",Start,Stop) == true)

       FileI->Archive = WriteUniqString(Start,Stop - Start);
    if (Section.Find("Component",Start,Stop) == true)
       FileI->Component = WriteUniqString(Start,Stop - Start);
       FileI->Archive = WriteUniqString(Start,Stop - Start);
    if (Section.Find("Component",Start,Stop) == true)
       FileI->Component = WriteUniqString(Start,Stop - Start);


@@ -578,7 +596,7 @@ bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,
    if (Section.FindFlag("NotAutomatic",FileI->Flags,
                        pkgCache::Flag::NotAutomatic) == false)
       _error->Warning("Bad NotAutomatic flag");
    if (Section.FindFlag("NotAutomatic",FileI->Flags,
                        pkgCache::Flag::NotAutomatic) == false)
       _error->Warning("Bad NotAutomatic flag");

-   
+

    return !_error->PendingError();
 }
                                                                        /*}}}*/
    return !_error->PendingError();
 }
                                                                        /*}}}*/