Minimal CD swaps

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

diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc
index 5d45b59bcb33ed2afd81863aa0b182587dc2ff38..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.23 1999/02/21 08:38:53 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


@@ -35,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. */


@@ -127,8 +135,11 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset)
       return false;
    
    if (Tag.Scan(Start,End - Start) == false)
       return false;
    
    if (Tag.Scan(Start,End - Start) == false)

+   {
+      cout << string(Start,End) << endl;

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

-  
+   }
+   

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -212,9 +223,12 @@ 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--);
       for (; (isspace(*Start) != 0 || *Start == ':') && Start < End; Start++);
       for (; isspace(End[-1]) != 0 && End > Start; End--);

-
+      

       return true;
    }
    
       return true;
    }
    


@@ -286,5 +300,3 @@ bool pkgTagSection::FindFlag(const char *Tag,unsigned long &Flags,
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-
-