Fixed size mismatch

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

diff --git a/apt-pkg/deb/deblistparser.cc b/apt-pkg/deb/deblistparser.cc
index 4c37eb77566f96516cd0497391b6e7af6057cde3..157a465f48c82b2a523c9c83f15172befbd3d981 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.3 1998/07/05 05:34:00 jgg Exp $
+// $Id: deblistparser.cc,v 1.17 1999/02/21 08:38:53 jgg Exp $

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


@@ -10,52 +10,19 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#include <pkglib/deblistparser.h>
-#include <pkglib/error.h>
+#include <apt-pkg/deblistparser.h>
+#include <apt-pkg/error.h>
+#include <apt-pkg/configuration.h>
+#include <apt-pkg/strutl.h>
+

 #include <system.h>
                                                                        /*}}}*/
 
 // ListParser::debListParser - Constructor                             /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 #include <system.h>
                                                                        /*}}}*/
 
 // ListParser::debListParser - Constructor                             /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-debListParser::debListParser(File &File) : Tags(File)
-{
-}
-                                                                       /*}}}*/
-// ListParser::FindTag - Find the tag and return a string              /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-string debListParser::FindTag(const char *Tag)
-{
-   const char *Start;
-   const char *Stop;
-   if (Section.Find(Tag,Start,Stop) == false)
-      return string();
-   return string(Start,Stop - Start);
-}
-                                                                       /*}}}*/
-// ListParser::FindTagI - Find the tag and return an int               /*{{{*/
-// ---------------------------------------------------------------------
-/* */
-signed long debListParser::FindTagI(const char *Tag,signed long Default)
+debListParser::debListParser(FileFd &File) : Tags(File)

 {
 {

-   const char *Start;
-   const char *Stop;
-   if (Section.Find(Tag,Start,Stop) == false)
-      return Default;
-   
-   // Copy it into a temp buffer so we can use strtol
-   char S[300];
-   if ((unsigned)(Stop - Start) >= sizeof(S))
-      return Default;
-   strncpy(S,Start,Stop-Start);
-   S[Stop - Start] = 0;
-   
-   char *End;
-   signed long Result = strtol(S,&End,10);
-   if (S == End)
-      return Default;
-   return Result;

 }
                                                                        /*}}}*/
 // ListParser::UniqFindTagWrite - Find the tag and write a unq string  /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::UniqFindTagWrite - Find the tag and write a unq string  /*{{{*/


@@ -70,47 +37,14 @@ unsigned long debListParser::UniqFindTagWrite(const char *Tag)
    return WriteUniqString(Start,Stop - Start);
 }
                                                                        /*}}}*/
    return WriteUniqString(Start,Stop - Start);
 }
                                                                        /*}}}*/

-// ListParser::HandleFlag - Sets a flag variable based on a tag                /*{{{*/
-// ---------------------------------------------------------------------
-/* This checks the tag for true/false yes/no etc */
-bool debListParser::HandleFlag(const char *Tag,unsigned long &Flags,
-                              unsigned long Flag)
-{
-   const char *Start;
-   const char *Stop;
-   if (Section.Find(Tag,Start,Stop) == false)
-      return true;
-   
-   int Set = 2;
-   if (strncasecmp(Start,"yes",Stop - Start) == 0)
-      Set = 1;
-   if (strncasecmp(Start,"true",Stop - Start) == 0)
-      Set = 1;
-   if (strncasecmp(Start,"no",Stop - Start) == 0)
-      Set = 0;
-   if (strncasecmp(Start,"false",Stop - Start) == 0)
-      Set = 0;
-   if (Set == 2)
-   {
-      _error->Warning("Unknown flag value");
-      return true;
-   }
-   
-   if (Set == 0)
-      Flags &= ~Flag;
-   if (Set == 1)
-      Flags |= Flag;
-   return true;
-}
-                                                                       /*}}}*/

 // ListParser::Package - Return the package name                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This is to return the name of the package this section describes */
 string debListParser::Package()
 {
 // ListParser::Package - Return the package name                       /*{{{*/
 // ---------------------------------------------------------------------
 /* This is to return the name of the package this section describes */
 string debListParser::Package()
 {

-   string Result = FindTag("Package");
+   string Result = Section.FindS("Package");

    if (Result.empty() == true)
    if (Result.empty() == true)

-      _error->Error("Encoutered a section with no Package: header");
+      _error->Error("Encountered a section with no Package: header");

    return Result;
 }
                                                                        /*}}}*/
    return Result;
 }
                                                                        /*}}}*/


@@ -121,7 +55,7 @@ string debListParser::Package()
    entry is assumed to only describe package properties */
 string debListParser::Version()
 {
    entry is assumed to only describe package properties */
 string debListParser::Version()
 {

-   return FindTag("Version");
+   return Section.FindS("Version");

 }
                                                                        /*}}}*/
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/
 }
                                                                        /*}}}*/
 // ListParser::NewVersion - Fill in the version structure              /*{{{*/


@@ -130,16 +64,14 @@ string debListParser::Version()
 bool debListParser::NewVersion(pkgCache::VerIterator Ver)
 {
    // Parse the section
 bool debListParser::NewVersion(pkgCache::VerIterator Ver)
 {
    // Parse the section

-   if ((Ver->Section = UniqFindTagWrite("Section")) == 0)
-      return _error->Warning("Missing Section tag");
+   Ver->Section = UniqFindTagWrite("Section");
+   Ver->Arch = UniqFindTagWrite("Architecture");

    
    // Archive Size
    
    // Archive Size

-   if ((Ver->Size = (unsigned)FindTagI("Size")) == 0)
-      return _error->Error("Unparsable Size field");
+   Ver->Size = (unsigned)Section.FindI("Size");

    
    // Unpacked Size (in K)
    
    // Unpacked Size (in K)

-   if ((Ver->InstalledSize = (unsigned)FindTagI("Installed-Size")) == 0)
-      return _error->Error("Unparsable Installed-Size field");
+   Ver->InstalledSize = (unsigned)Section.FindI("Installed-Size");

    Ver->InstalledSize *= 1024;
 
    // Priority
    Ver->InstalledSize *= 1024;
 
    // Priority


@@ -147,27 +79,27 @@ bool debListParser::NewVersion(pkgCache::VerIterator Ver)
    const char *Stop;
    if (Section.Find("Priority",Start,Stop) == true)
    {
    const char *Stop;
    if (Section.Find("Priority",Start,Stop) == true)
    {

-      WordList PrioList[] = {{"important",pkgCache::Important},
-                            {"required",pkgCache::Required},
-                            {"standard",pkgCache::Standard},
-                             {"optional",pkgCache::Optional},
-                             {"extra",pkgCache::Extra}};
+      WordList PrioList[] = {{"important",pkgCache::State::Important},
+                            {"required",pkgCache::State::Required},
+                            {"standard",pkgCache::State::Standard},
+                            {"optional",pkgCache::State::Optional},
+                            {"extra",pkgCache::State::Extra}};

       if (GrabWord(string(Start,Stop-Start),PrioList,
                   _count(PrioList),Ver->Priority) == false)
         return _error->Error("Malformed Priority line");
    }
 
       if (GrabWord(string(Start,Stop-Start),PrioList,
                   _count(PrioList),Ver->Priority) == false)
         return _error->Error("Malformed Priority line");
    }
 

-   if (ParseDepends(Ver,"Depends",pkgCache::Depends) == false)
+   if (ParseDepends(Ver,"Depends",pkgCache::Dep::Depends) == false)

       return false;
       return false;

-   if (ParseDepends(Ver,"PreDepends",pkgCache::PreDepends) == false)
+   if (ParseDepends(Ver,"Pre-Depends",pkgCache::Dep::PreDepends) == false)

       return false;
       return false;

-   if (ParseDepends(Ver,"Suggests",pkgCache::Suggests) == false)
+   if (ParseDepends(Ver,"Suggests",pkgCache::Dep::Suggests) == false)

       return false;
       return false;

-   if (ParseDepends(Ver,"Recommends",pkgCache::Recommends) == false)
+   if (ParseDepends(Ver,"Recommends",pkgCache::Dep::Recommends) == false)

       return false;
       return false;

-   if (ParseDepends(Ver,"Conflicts",pkgCache::Conflicts) == false)
+   if (ParseDepends(Ver,"Conflicts",pkgCache::Dep::Conflicts) == false)

       return false;
       return false;

-   if (ParseDepends(Ver,"Replaces",pkgCache::Depends) == false)
+   if (ParseDepends(Ver,"Replaces",pkgCache::Dep::Replaces) == false)

       return false;
 
    if (ParseProvides(Ver) == false)
       return false;
 
    if (ParseProvides(Ver) == false)


@@ -184,12 +116,15 @@ bool debListParser::UsePackage(pkgCache::PkgIterator Pkg,
                               pkgCache::VerIterator Ver)
 {
    if (Pkg->Section == 0)
                               pkgCache::VerIterator Ver)
 {
    if (Pkg->Section == 0)

-      if ((Pkg->Section = UniqFindTagWrite("Section")) == 0)
-        return false;
-   if (HandleFlag("Essential",Pkg->Flags,pkgCache::Essential) == false)
+      Pkg->Section = UniqFindTagWrite("Section");
+   if (Section.FindFlag("Essential",Pkg->Flags,pkgCache::Flag::Essential) == false)

       return false;
       return false;

-   if (HandleFlag("Immediate-Configure",Pkg->Flags,pkgCache::ImmediateConf) == false)
+   if (Section.FindFlag("Important",Pkg->Flags,pkgCache::Flag::Important) == false)

       return false;
       return false;

+
+   if (strcmp(Pkg.Name(),"apt") == 0)
+      Pkg->Flags |= pkgCache::Flag::Important;
+   

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


@@ -223,11 +158,11 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
       return _error->Error("Malformed Status line");
 
    // Process the want field
       return _error->Error("Malformed Status line");
 
    // Process the want field

-   WordList WantList[] = {{"unknown",pkgCache::Unknown},
-                          {"install",pkgCache::Install},
-                          {"hold",pkgCache::Hold},
-                          {"deinstall",pkgCache::DeInstall},
-                          {"purge",pkgCache::Purge}};
+   WordList WantList[] = {{"unknown",pkgCache::State::Unknown},
+                          {"install",pkgCache::State::Install},
+                          {"hold",pkgCache::State::Hold},
+                          {"deinstall",pkgCache::State::DeInstall},
+                          {"purge",pkgCache::State::Purge}};

    if (GrabWord(string(Start,I-Start),WantList,
                _count(WantList),Pkg->SelectedState) == false)
       return _error->Error("Malformed 1st word in the Status line");
    if (GrabWord(string(Start,I-Start),WantList,
                _count(WantList),Pkg->SelectedState) == false)
       return _error->Error("Malformed 1st word in the Status line");


@@ -240,10 +175,10 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
       return _error->Error("Malformed status line, no 2nd word");
 
    // Process the flag field
       return _error->Error("Malformed status line, no 2nd word");
 
    // Process the flag field

-   WordList FlagList[] = {{"ok",pkgCache::Ok},
-                          {"reinstreq",pkgCache::ReInstReq},
-                          {"hold",pkgCache::HoldInst},
-                          {"hold-reinstreq",pkgCache::HoldReInstReq}};
+   WordList FlagList[] = {{"ok",pkgCache::State::Ok},
+                          {"reinstreq",pkgCache::State::ReInstReq},
+                          {"hold",pkgCache::State::HoldInst},
+                          {"hold-reinstreq",pkgCache::State::HoldReInstReq}};

    if (GrabWord(string(Start,I-Start),FlagList,
                _count(FlagList),Pkg->InstState) == false)
       return _error->Error("Malformed 2nd word in the Status line");
    if (GrabWord(string(Start,I-Start),FlagList,
                _count(FlagList),Pkg->InstState) == false)
       return _error->Error("Malformed 2nd word in the Status line");


@@ -256,15 +191,15 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
       return _error->Error("Malformed Status line, no 3rd word");
 
    // Process the flag field
       return _error->Error("Malformed Status line, no 3rd word");
 
    // Process the flag field

-   WordList StatusList[] = {{"not-installed",pkgCache::NotInstalled},
-                            {"unpacked",pkgCache::UnPacked},
-                            {"half-configured",pkgCache::HalfConfigured},
-                            {"installed",pkgCache::Installed},
-                            {"uninstalled",pkgCache::UnInstalled},
-                            {"half-installed",pkgCache::HalfInstalled},
-                            {"config-files",pkgCache::ConfigFiles},
-                            {"post-inst-failed",pkgCache::HalfConfigured},
-                            {"removal-failed",pkgCache::HalfInstalled}};
+   WordList StatusList[] = {{"not-installed",pkgCache::State::NotInstalled},
+                            {"unpacked",pkgCache::State::UnPacked},
+                            {"half-configured",pkgCache::State::HalfConfigured},
+                            {"installed",pkgCache::State::Installed},
+                            {"uninstalled",pkgCache::State::UnInstalled},
+                            {"half-installed",pkgCache::State::HalfInstalled},
+                            {"config-files",pkgCache::State::ConfigFiles},
+                            {"post-inst-failed",pkgCache::State::HalfConfigured},
+                            {"removal-failed",pkgCache::State::HalfInstalled}};

    if (GrabWord(string(Start,I-Start),StatusList,
                _count(StatusList),Pkg->CurrentState) == false)
       return _error->Error("Malformed 3rd word in the Status line");
    if (GrabWord(string(Start,I-Start),StatusList,
                _count(StatusList),Pkg->CurrentState) == false)
       return _error->Error("Malformed 3rd word in the Status line");


@@ -273,8 +208,8 @@ bool debListParser::ParseStatus(pkgCache::PkgIterator Pkg,
       version as well. Only if it is actually installed.. Otherwise
       the interesting dpkg handling of the status file creates bogus 
       entries. */
       version as well. Only if it is actually installed.. Otherwise
       the interesting dpkg handling of the status file creates bogus 
       entries. */

-   if (!(Pkg->CurrentState == pkgCache::NotInstalled ||
-        Pkg->CurrentState == pkgCache::ConfigFiles))
+   if (!(Pkg->CurrentState == pkgCache::State::NotInstalled ||
+        Pkg->CurrentState == pkgCache::State::ConfigFiles))

    {
       if (Ver.end() == true)
         _error->Warning("Encountered status field in a non-version description");
    {
       if (Ver.end() == true)
         _error->Warning("Encountered status field in a non-version description");


@@ -330,19 +265,19 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
         if (*I == '=')
         {
            I++;
         if (*I == '=')
         {
            I++;

-           Op = pkgCache::LessEq;
+           Op = pkgCache::Dep::LessEq;

            break;
         }
         
         if (*I == '<')
         {
            I++;
            break;
         }
         
         if (*I == '<')
         {
            I++;

-           Op = pkgCache::Less;
+           Op = pkgCache::Dep::Less;

            break;
         }
         
         // < is the same as <= and << is really Cs < for some reason
            break;
         }
         
         // < is the same as <= and << is really Cs < for some reason

-        Op = pkgCache::LessEq;
+        Op = pkgCache::Dep::LessEq;

         break;
         
         case '>':
         break;
         
         case '>':


@@ -350,29 +285,29 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
         if (*I == '=')
         {
            I++;
         if (*I == '=')
         {
            I++;

-           Op = pkgCache::GreaterEq;
+           Op = pkgCache::Dep::GreaterEq;

            break;
         }
         
         if (*I == '>')
         {
            I++;
            break;
         }
         
         if (*I == '>')
         {
            I++;

-           Op = pkgCache::Greater;
+           Op = pkgCache::Dep::Greater;

            break;
         }
         
         // > is the same as >= and >> is really Cs > for some reason
            break;
         }
         
         // > is the same as >= and >> is really Cs > for some reason

-        Op = pkgCache::GreaterEq;
+        Op = pkgCache::Dep::GreaterEq;

         break;
         
         case '=':
         break;
         
         case '=':

-        Op = pkgCache::Equals;
+        Op = pkgCache::Dep::Equals;

         I++;
         break;
         
         // HACK around bad package definitions
         default:
         I++;
         break;
         
         // HACK around bad package definitions
         default:

-        Op = pkgCache::Equals;
+        Op = pkgCache::Dep::Equals;

         break;
       }
       
         break;
       }
       


@@ -389,13 +324,13 @@ const char *debListParser::ParseDepends(const char *Start,const char *Stop,
    else
    {
       Ver = string();
    else
    {
       Ver = string();

-      Op = pkgCache::NoOp;
+      Op = pkgCache::Dep::NoOp;

    }
    
    // Skip whitespace
    for (;I != Stop && isspace(*I) != 0; I++);
    if (I != Stop && *I == '|')
    }
    
    // Skip whitespace
    for (;I != Stop && isspace(*I) != 0; I++);
    if (I != Stop && *I == '|')

-      Op |= pkgCache::Or;
+      Op |= pkgCache::Dep::Or;

    
    if (I == Stop || *I == ',' || *I == '|')
    {
    
    if (I == Stop || *I == ',' || *I == '|')
    {


@@ -423,13 +358,16 @@ bool debListParser::ParseDepends(pkgCache::VerIterator Ver,
    string Version;
    unsigned int Op;
 
    string Version;
    unsigned int Op;
 

-   while ((Start = ParseDepends(Start,Stop,Package,Version,Op)) != Stop)
+   while (1)

    {
    {

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

       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);
       if (Start == 0)
         return _error->Error("Problem parsing dependency %s",Tag);

-
+      

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

+      if (Start == Stop)
+        break;

    }
    return true;
 }
    }
    return true;
 }


@@ -453,7 +391,7 @@ bool debListParser::ParseProvides(pkgCache::VerIterator Ver)
       Start = ParseDepends(Start,Stop,Package,Version,Op);
       if (Start == 0)
         return _error->Error("Problem parsing Provides line");
       Start = ParseDepends(Start,Stop,Package,Version,Op);
       if (Start == 0)
         return _error->Error("Problem parsing Provides line");

-      if (Op != pkgCache::NoOp)
+      if (Op != pkgCache::Dep::NoOp)

         return _error->Error("Malformed provides line");
 
       if (NewProvides(Ver,Package,Version) == false)
         return _error->Error("Malformed provides line");
 
       if (NewProvides(Ver,Package,Version) == false)


@@ -489,6 +427,7 @@ bool debListParser::GrabWord(string Word,WordList *List,int Count,
 bool debListParser::Step()
 {
    iOffset = Tags.Offset();
 bool debListParser::Step()
 {
    iOffset = Tags.Offset();

+   string Arch = _config->Find("APT::architecture");

    while (Tags.Step(Section) == true)
    {
       /* See if this is the correct Architecture, if it isnt then we
    while (Tags.Step(Section) == true)
    {
       /* See if this is the correct Architecture, if it isnt then we


@@ -497,13 +436,11 @@ bool debListParser::Step()
       const char *Stop;
       if (Section.Find("Architecture",Start,Stop) == false)
         return true;
       const char *Stop;
       if (Section.Find("Architecture",Start,Stop) == false)
         return true;

-            
-      if (strncmp(Start,"i386",Stop - Start) == 0 &&
-         strlen("i386") == (unsigned)(Stop - Start))
+
+      if (stringcmp(Start,Stop,Arch.begin(),Arch.end()) == 0)

         return true;
 
         return true;
 

-      if (strncmp(Start,"all",Stop - Start) == 0 &&
-         3 == (unsigned)(Stop - Start))
+      if (stringcmp(Start,Stop,"all") == 0)

         return true;
 
       iOffset = Tags.Offset();
         return true;
 
       iOffset = Tags.Offset();


@@ -511,3 +448,36 @@ bool debListParser::Step()
    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/

+// ListParser::LoadReleaseInfo - Load the release information          /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool debListParser::LoadReleaseInfo(pkgCache::PkgFileIterator FileI,
+                                   FileFd &File)
+{
+   pkgTagFile Tags(File);
+   pkgTagSection Section;
+   if (Tags.Step(Section) == false)
+      return false;
+
+   const char *Start;
+   const char *Stop;
+   if (Section.Find("Archive",Start,Stop) == true)
+      FileI->Archive = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Component",Start,Stop) == true)
+      FileI->Component = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Version",Start,Stop) == true)
+      FileI->Version = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Origin",Start,Stop) == true)
+      FileI->Origin = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Label",Start,Stop) == true)
+      FileI->Label = WriteUniqString(Start,Stop - Start);
+   if (Section.Find("Architecture",Start,Stop) == true)
+      FileI->Architecture = WriteUniqString(Start,Stop - Start);
+   
+   if (Section.FindFlag("NotAutomatic",FileI->Flags,
+                       pkgCache::Flag::NotAutomatic) == false)
+      _error->Warning("Bad NotAutomatic flag");
+   
+   return !_error->PendingError();
+}
+                                                                       /*}}}*/