Another error message for failed updates

[apt.git] / apt-pkg / tagfile.cc

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 9a7c9734d3bc1855fe92f1e5f711c402d04a124d..97e5c244a5efce98eb6274d064ef785ffda966e2 100644 (file)
--- a/apt-pkg/tagfile.cc
+++ b/apt-pkg/tagfile.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: tagfile.cc,v 1.16 1998/11/28 03:54:29 jgg Exp $
+// $Id: tagfile.cc,v 1.25 1999/07/03 06:45:40 jgg Exp $

 /* ######################################################################
 
    Fast scanner for RFC-822 type header information
 /* ######################################################################
 
    Fast scanner for RFC-822 type header information


@@ -17,6 +17,7 @@
 
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>
 
 #include <apt-pkg/tagfile.h>
 #include <apt-pkg/error.h>

+#include <apt-pkg/strutl.h>

 
 #include <string>
 #include <stdio.h>
 
 #include <string>
 #include <stdio.h>


@@ -34,6 +35,14 @@ pkgTagFile::pkgTagFile(FileFd &Fd,unsigned long Size) : Fd(Fd), Size(Size)
    Fill();
 }
                                                                        /*}}}*/
    Fill();
 }
                                                                        /*}}}*/

+// pkgTagFile::~pkgTagFile - Destructor                                        /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+pkgTagFile::~pkgTagFile()
+{
+   delete [] Buffer;
+}
+                                                                       /*}}}*/

 // TagFile::Step - Advance to the next section                         /*{{{*/
 // ---------------------------------------------------------------------
 /* If the Section Scanner fails we refill the buffer and try again. */
 // TagFile::Step - Advance to the next section                         /*{{{*/
 // ---------------------------------------------------------------------
 /* If the Section Scanner fails we refill the buffer and try again. */


@@ -45,7 +54,7 @@ bool pkgTagFile::Step(pkgTagSection &Tag)
         return false;
       
       if (Tag.Scan(Start,End - Start) == false)
         return false;
       
       if (Tag.Scan(Start,End - Start) == false)

-        return _error->Error("Unable to parse package file");
+        return _error->Error("Unable to parse package file %s (1)",Fd.Name().c_str());

    }   
    Start += Tag.size();
    iOffset += Tag.size();
    }   
    Start += Tag.size();
    iOffset += Tag.size();


@@ -61,17 +70,28 @@ bool pkgTagFile::Fill()
 {
    unsigned long EndSize = End - Start;
    
 {
    unsigned long EndSize = End - Start;
    

+   memmove(Buffer,Start,EndSize);
+   Start = Buffer;
+   End = Buffer + EndSize;
+   

    if (Left == 0)
    {
    if (Left == 0)
    {

-      if (EndSize <= 1)
+      if (EndSize <= 3)

         return false;
         return false;

+      if (Size - (End - Buffer) < 4)
+        return true;
+      
+      // Append a double new line if one does not exist
+      unsigned int LineCount = 0;
+      for (const char *E = End - 1; E - End < 6 && (*E == '\n' || *E == '\r'); E--)
+        if (*E == '\n')
+           LineCount++;
+      for (; LineCount < 2; LineCount++)
+        *End++ = '\n';
+      

       return true;
    }
    
       return true;
    }
    

-   memmove(Buffer,Start,EndSize);
-   Start = Buffer;
-   End = Buffer + EndSize;
-   

    // See if only a bit of the file is left
    if (Left < Size - (End - Buffer))
    {
    // See if only a bit of the file is left
    if (Left < Size - (End - Buffer))
    {


@@ -104,49 +124,70 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
       return false;
    End = Start = Buffer;
    
       return false;
    End = Start = Buffer;
    

+   if (Fill() == false)
+      return false;
+
+   if (Tag.Scan(Start,End - Start) == true)
+      return true;
+   
+   // This appends a double new line (for the real eof handling)

    if (Fill() == false)
       return false;
    
    if (Tag.Scan(Start,End - Start) == false)
    if (Fill() == false)
       return false;
    
    if (Tag.Scan(Start,End - Start) == false)

-      return _error->Error("Unable to parse package file");
+   {
+      cout << string(Start,End) << endl;
+      return _error->Error("Unable to parse package file %s (2)",Fd.Name().c_str());
+   }
+   

    return true;
 }
                                                                        /*}}}*/
 // TagSection::Scan - Scan for the end of the header information       /*{{{*/
 // ---------------------------------------------------------------------
 /* This looks for the first double new line in the data stream. It also
    return true;
 }
                                                                        /*}}}*/
 // TagSection::Scan - Scan for the end of the header information       /*{{{*/
 // ---------------------------------------------------------------------
 /* This looks for the first double new line in the data stream. It also

-   indexes the tags in the section. */
+   indexes the tags in the section. This very simple hash function for the
+   first 3 letters gives very good performance on the debian package files */

 bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
 {
    const char *End = Start + MaxLength;
    Stop = Section = Start;
 bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength)
 {
    const char *End = Start + MaxLength;
    Stop = Section = Start;

+   memset(AlphaIndexes,0,sizeof(AlphaIndexes));
+
+   if (Stop == 0)
+      return false;

    
    TagCount = 0;
    
    TagCount = 0;

-   Indexes[TagCount++] = Stop - Section;
-   Stop++;
-   for (; Stop < End; Stop++)
+   while (TagCount < sizeof(Indexes)/sizeof(Indexes[0]) && Stop < End)

    {
    {

-      if (Stop[-1] != '\n')
-        continue;
+      // Start a new index and add it to the hash
+      if (isspace(Stop[0]) == 0)
+      {
+        Indexes[TagCount++] = Stop - Section;
+        unsigned char A = tolower(Stop[0]) - 'a';
+        unsigned char B = tolower(Stop[1]) - 'a';
+        unsigned char C = tolower(Stop[3]) - 'a';
+        AlphaIndexes[((A + C/3)%26) + 26*((B + C/2)%26)] = TagCount;
+      }

 
 

-      // Skip line feeds
-      for (; Stop[0] == '\r' && Stop < End; Stop++);
+      Stop = (const char *)memchr(Stop,'\n',End - Stop);

       
       

-      if (Stop[0] == '\n')
+      if (Stop == 0)
+        return false;
+      
+      for (; Stop[1] == '\r' && Stop+1 < End; Stop++);
+
+      // Double newline marks the end of the record
+      if (Stop+1 < End && Stop[1] == '\n')

       {
       {

-        // Extra one at the end to simplify find

         Indexes[TagCount] = Stop - Section;
         for (; (Stop[0] == '\n' || Stop[0] == '\r') && Stop < End; Stop++);
         return true;
       }
       
         Indexes[TagCount] = Stop - Section;
         for (; (Stop[0] == '\n' || Stop[0] == '\r') && Stop < End; Stop++);
         return true;
       }
       

-      if (isspace(Stop[0]) == 0)
-        Indexes[TagCount++] = Stop - Section;
-      
-      // Just in case.
-      if (TagCount > sizeof(Indexes)/sizeof(Indexes[0]))
-        TagCount = sizeof(Indexes)/sizeof(Indexes[0]);
-   }   
+      Stop++;
+   }
+

    return false;
 }
                                                                        /*}}}*/
    return false;
 }
                                                                        /*}}}*/


@@ -157,13 +198,24 @@ bool pkgTagSection::Find(const char *Tag,const char *&Start,
                         const char *&End)
 {
    unsigned int Length = strlen(Tag);
                         const char *&End)
 {
    unsigned int Length = strlen(Tag);

-   for (unsigned int I = 0; I != TagCount; I++)
+   unsigned char A = tolower(Tag[0]) - 'a';
+   unsigned char B = tolower(Tag[1]) - 'a';
+   unsigned char C = tolower(Tag[3]) - 'a';
+   unsigned int I = AlphaIndexes[((A + C/3)%26) + 26*((B + C/2)%26)];
+   if (I == 0)
+      return false;
+   I--;
+   
+   for (unsigned int Counter = 0; Counter != TagCount; Counter++, 
+       I = (I+1)%TagCount)

    {
    {

-      if (strncasecmp(Tag,Section + Indexes[I],Length) != 0)
+      const char *St;
+      St = Section + Indexes[I];
+      if (strncasecmp(Tag,St,Length) != 0)

         continue;
 
       // Make sure the colon is in the right place
         continue;
 
       // Make sure the colon is in the right place

-      const char *C = Section + Length + Indexes[I];
+      const char *C = St + Length;

       for (; isspace(*C) != 0; C++);
       if (*C != ':')
         continue;
       for (; isspace(*C) != 0; C++);
       if (*C != ':')
         continue;


@@ -171,11 +223,15 @@ bool pkgTagSection::Find(const char *Tag,const char *&Start,
       // Strip off the gunk from the start end
       Start = C;
       End = Section + Indexes[I+1];
       // Strip off the gunk from the start end
       Start = C;
       End = Section + Indexes[I+1];

+      if (Start >= End)
+        return _error->Error("Internal parsing error");
+      

       for (; (isspace(*Start) != 0 || *Start == ':') && Start < End; Start++);
       for (; isspace(End[-1]) != 0 && End > Start; End--);
       
       return true;
    }
       for (; (isspace(*Start) != 0 || *Start == ':') && Start < End; Start++);
       for (; isspace(End[-1]) != 0 && End > Start; End--);
       
       return true;
    }

+   

    Start = End = 0;
    return false;
 }
    Start = End = 0;
    return false;
 }


@@ -195,14 +251,52 @@ string pkgTagSection::FindS(const char *Tag)
 // TagSection::FindI - Find an integer                                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // TagSection::FindI - Find an integer                                 /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-unsigned int pkgTagSection::FindI(const char *Tag)
+signed int pkgTagSection::FindI(const char *Tag,signed long Default)

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

-   const char *End;
-   if (Find(Tag,Start,End) == false)
-      return 0;
+   const char *Stop;
+   if (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;
+}
+                                                                       /*}}}*/
+// TagSection::FindFlag - Locate a yes/no type flag                    /*{{{*/
+// ---------------------------------------------------------------------
+/* The bits marked in Flag are masked on/off in Flags */
+bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
+                            unsigned long Flag)
+{
+   const char *Start;
+   const char *Stop;
+   if (Find(Tag,Start,Stop) == false)
+      return true;

    
    

-   return atoi(string(Start,End).c_str());
+   switch (StringToBool(string(Start,Stop)))
+   {     
+      case 0:
+      Flags &= ~Flag;
+      return true;
+
+      case 1:
+      Flags |= Flag;
+      return true;
+
+      default:
+      _error->Warning("Unknown flag value");
+      return true;
+   }
+   return true;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-